[{"id":1453,"web_url":"https://patchwork.libcamera.org/comment/1453/","msgid":"<20190418144052.stutpthmeoccnmod@uno.localdomain>","date":"2019-04-18T14:40:52","subject":"Re: [libcamera-devel] [PATCH v3 12/13] libcamera: pipeline: ipu3:\n\tUse the new CameraSensor class","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent,\n\nOn Thu, Apr 18, 2019 at 05:14:36PM +0300, Laurent Pinchart wrote:\n> Replace the manual handling of sensor formats with usage of the new\n> CameraSensor class.\n>\n> Signed-off-by: Laurent Pinchart \n> Reviewed-by: Niklas Söderlund \n> ---\n> Changes since v2:\n>\n> - Properly sort the CIO2 supported media bus codes numerically\n>\n> Changes since v1:\n>\n> - Move sensor entity function check to CameraSensor class\n> - Verify sensor media bus codes at init time\n> ---\n> src/libcamera/pipeline/ipu3/ipu3.cpp | 107 +++++++++------------------\n> 1 file changed, 36 insertions(+), 71 deletions(-)\n>\n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index f43969099b48..c677ee9b51da 100644\n> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> @@ -5,6 +5,7 @@\n> * ipu3.cpp - Pipeline handler for Intel IPU3\n> */\n>\n> +#include \n\nWhat do you need this for?\n\n> #include \n> #include \n> #include \n> @@ -15,6 +16,7 @@\n> #include \n> #include \n>\n> +#include \"camera_sensor.h\"\n> #include \"device_enumerator.h\"\n> #include \"log.h\"\n> #include \"media_device.h\"\n> @@ -124,11 +126,7 @@ public:\n>\n> \tV4L2Device *output_;\n> \tV4L2Subdevice *csi2_;\n> -\tV4L2Subdevice *sensor_;\n> -\n> -\t/* Maximum sizes and the mbus code used to produce them. */\n> -\tunsigned int mbusCode_;\n> -\tSize maxSize_;\n> +\tCameraSensor *sensor_;\n>\n> \tBufferPool pool_;\n> };\n> @@ -257,8 +255,9 @@ int PipelineHandlerIPU3::configureStreams(Camera *camera,\n> \t\treturn -EINVAL;\n> \t}\n>\n> -\tif (cfg.width > cio2->maxSize_.width ||\n> -\t cfg.height > cio2->maxSize_.height) {\n> +\tconst Size &resolution = cio2->sensor_->resolution();\n> +\tif (cfg.width > resolution.width ||\n> +\t cfg.height > resolution.height) {\n> \t\tLOG(IPU3, Error)\n> \t\t\t<< \"Invalid stream size: larger than sensor resolution\";\n> \t\treturn -EINVAL;\n> @@ -1032,45 +1031,39 @@ int CIO2Device::init(const MediaDevice *media, unsigned int index)\n>\n> \tMediaLink *link = links[0];\n> \tMediaEntity *sensorEntity = link->source()->entity();\n> -\tif (sensorEntity->function() != MEDIA_ENT_F_CAM_SENSOR)\n> -\t\treturn -ENODEV;\n> +\tsensor_ = new CameraSensor(sensorEntity);\n> +\tret = sensor_->init();\n> +\tif (ret)\n> +\t\treturn ret;\n>\n> \tret = link->setEnabled(true);\n> \tif (ret)\n> \t\treturn ret;\n>\n> \t/*\n> -\t * Now that we're sure a sensor subdevice is connected, make sure it\n> -\t * produces at least one image format compatible with CIO2 requirements\n> -\t * and cache the camera maximum size.\n> +\t * Make sure the sensor produces at least one format compatible with\n> +\t * the CIO2 requirements.\n> \t *\n> +\t * utils::set_overlap requires the ranges to be sorted, keep the\n> +\t * cio2Codes vector sorted in ascending order.\n> +\t */\n> +\tconst std::vector cio2Codes{ MEDIA_BUS_FMT_SBGGR10_1X10,\n> +\t\t\t\t\t\t MEDIA_BUS_FMT_SGRBG10_1X10,\n> +\t\t\t\t\t\t MEDIA_BUS_FMT_SGBRG10_1X10,\n\nAs you mentioned you ordered them, shouldn't SGBR come before SGRB ?\n\nMinors apart:\nReviewed-by: Jacopo Mondi \n\nI'll rebase my multiple stream support series on top of this patches!\n\nThanks\n j\n\n> +\t\t\t\t\t\t MEDIA_BUS_FMT_SRGGB10_1X10 };\n> +\tconst std::vector &sensorCodes = sensor_->mbusCodes();\n> +\tif (!utils::set_overlap(sensorCodes.begin(), sensorCodes.end(),\n> +\t\t\t\tcio2Codes.begin(), cio2Codes.end())) {\n> +\t\tLOG(IPU3, Error)\n> +\t\t\t<< \"Sensor \" << sensor_->entity()->name()\n> +\t\t\t<< \" has not format compatible with the IPU3\";\n> +\t\treturn -EINVAL;\n> +\t}\n> +\n> +\t/*\n> \t * \\todo Define when to open and close video device nodes, as they\n> \t * might impact on power consumption.\n> \t */\n> -\tsensor_ = new V4L2Subdevice(sensorEntity);\n> -\tret = sensor_->open();\n> -\tif (ret)\n> -\t\treturn ret;\n> -\n> -\tfor (auto it : sensor_->formats(0)) {\n> -\t\tint mbusCode = mediaBusToFormat(it.first);\n> -\t\tif (mbusCode < 0)\n> -\t\t\tcontinue;\n> -\n> -\t\tfor (const SizeRange &size : it.second) {\n> -\t\t\tif (maxSize_.width < size.max.width &&\n> -\t\t\t maxSize_.height < size.max.height) {\n> -\t\t\t\tmaxSize_ = size.max;\n> -\t\t\t\tmbusCode_ = mbusCode;\n> -\t\t\t}\n> -\t\t}\n> -\t}\n> -\tif (maxSize_.width == 0) {\n> -\t\tLOG(IPU3, Info) << \"Sensor '\" << sensor_->entity()->name()\n> -\t\t\t\t<< \"' detected, but no supported image format \"\n> -\t\t\t\t<< \" found: skip camera creation\";\n> -\t\treturn -ENODEV;\n> -\t}\n>\n> \tcsi2_ = new V4L2Subdevice(csi2Entity);\n> \tret = csi2_->open();\n> @@ -1096,47 +1089,19 @@ int CIO2Device::init(const MediaDevice *media, unsigned int index)\n> int CIO2Device::configure(const StreamConfiguration &config,\n> \t\t\t V4L2DeviceFormat *outputFormat)\n> {\n> -\tunsigned int imageSize = config.width * config.height;\n> -\tV4L2SubdeviceFormat sensorFormat = {};\n> -\tunsigned int best = ~0;\n> +\tV4L2SubdeviceFormat sensorFormat;\n> \tint ret;\n>\n> -\tfor (auto it : sensor_->formats(0)) {\n> -\t\t/* Only consider formats consumable by the CIO2 unit. */\n> -\t\tif (mediaBusToFormat(it.first) < 0)\n> -\t\t\tcontinue;\n> -\n> -\t\tfor (const SizeRange &size : it.second) {\n> -\t\t\t/*\n> -\t\t\t * Only select formats bigger than the requested sizes\n> -\t\t\t * as the IPU3 cannot up-scale.\n> -\t\t\t *\n> -\t\t\t * \\todo: Unconditionally scale on the sensor as much\n> -\t\t\t * as possible. This will need to be revisited when\n> -\t\t\t * implementing the scaling policy.\n> -\t\t\t */\n> -\t\t\tif (size.max.width < config.width ||\n> -\t\t\t size.max.height < config.height)\n> -\t\t\t\tcontinue;\n> -\n> -\t\t\tunsigned int diff = size.max.width * size.max.height\n> -\t\t\t\t\t - imageSize;\n> -\t\t\tif (diff >= best)\n> -\t\t\t\tcontinue;\n> -\n> -\t\t\tbest = diff;\n> -\n> -\t\t\tsensorFormat.width = size.max.width;\n> -\t\t\tsensorFormat.height = size.max.height;\n> -\t\t\tsensorFormat.mbus_code = it.first;\n> -\t\t}\n> -\t}\n> -\n> \t/*\n> \t * Apply the selected format to the sensor, the CSI-2 receiver and\n> \t * the CIO2 output device.\n> \t */\n> -\tret = sensor_->setFormat(0, &sensorFormat);\n> +\tsensorFormat = sensor_->getFormat({ MEDIA_BUS_FMT_SBGGR10_1X10,\n> +\t\t\t\t\t MEDIA_BUS_FMT_SGBRG10_1X10,\n> +\t\t\t\t\t MEDIA_BUS_FMT_SGRBG10_1X10,\n> +\t\t\t\t\t MEDIA_BUS_FMT_SRGGB10_1X10 },\n> +\t\t\t\t\t Size(config.width, config.height));\n> +\tret = sensor_->setFormat(&sensorFormat);\n> \tif (ret)\n> \t\treturn ret;\n>\n> --\n> Regards,\n>\n> Laurent Pinchart\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 47A2960DC6\n\tfor ;\n\tThu, 18 Apr 2019 16:40:00 +0200 (CEST)","from uno.localdomain (2-224-242-101.ip172.fastwebnet.it\n\t[2.224.242.101]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay11.mail.gandi.net (Postfix) with ESMTPSA id BB22D10000F;\n\tThu, 18 Apr 2019 14:39:59 +0000 (UTC)"],"Date":"Thu, 18 Apr 2019 16:40:52 +0200","From":"Jacopo Mondi ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190418144052.stutpthmeoccnmod@uno.localdomain>","References":"<20190418141437.14014-1-laurent.pinchart@ideasonboard.com>\n\t<20190418141437.14014-13-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"ur2wl76iovdbk7fq\"","Content-Disposition":"inline","In-Reply-To":"<20190418141437.14014-13-laurent.pinchart@ideasonboard.com>","User-Agent":"NeoMutt/20180716","Subject":"Re: [libcamera-devel] [PATCH v3 12/13] libcamera: pipeline: ipu3:\n\tUse the new CameraSensor class","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 18 Apr 2019 14:40:00 -0000"}},{"id":1457,"web_url":"https://patchwork.libcamera.org/comment/1457/","msgid":"<20190418150828.GT4806@pendragon.ideasonboard.com>","date":"2019-04-18T15:08:28","subject":"Re: [libcamera-devel] [PATCH v3 12/13] libcamera: pipeline: ipu3:\n\tUse the new CameraSensor class","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn Thu, Apr 18, 2019 at 04:40:52PM +0200, Jacopo Mondi wrote:\n> On Thu, Apr 18, 2019 at 05:14:36PM +0300, Laurent Pinchart wrote:\n> > Replace the manual handling of sensor formats with usage of the new\n> > CameraSensor class.\n> >\n> > Signed-off-by: Laurent Pinchart \n> > Reviewed-by: Niklas Söderlund \n> > ---\n> > Changes since v2:\n> >\n> > - Properly sort the CIO2 supported media bus codes numerically\n> >\n> > Changes since v1:\n> >\n> > - Move sensor entity function check to CameraSensor class\n> > - Verify sensor media bus codes at init time\n> > ---\n> > src/libcamera/pipeline/ipu3/ipu3.cpp | 107 +++++++++------------------\n> > 1 file changed, 36 insertions(+), 71 deletions(-)\n> >\n> > diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> > index f43969099b48..c677ee9b51da 100644\n> > --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> > +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> > @@ -5,6 +5,7 @@\n> > * ipu3.cpp - Pipeline handler for Intel IPU3\n> > */\n> >\n> > +#include \n> \n> What do you need this for?\n\nWe don't, I've removed it. It was a leftover.\n\n> > #include \n> > #include \n> > #include \n> > @@ -15,6 +16,7 @@\n> > #include \n> > #include \n> >\n> > +#include \"camera_sensor.h\"\n> > #include \"device_enumerator.h\"\n> > #include \"log.h\"\n> > #include \"media_device.h\"\n> > @@ -124,11 +126,7 @@ public:\n> >\n> > \tV4L2Device *output_;\n> > \tV4L2Subdevice *csi2_;\n> > -\tV4L2Subdevice *sensor_;\n> > -\n> > -\t/* Maximum sizes and the mbus code used to produce them. */\n> > -\tunsigned int mbusCode_;\n> > -\tSize maxSize_;\n> > +\tCameraSensor *sensor_;\n> >\n> > \tBufferPool pool_;\n> > };\n> > @@ -257,8 +255,9 @@ int PipelineHandlerIPU3::configureStreams(Camera *camera,\n> > \t\treturn -EINVAL;\n> > \t}\n> >\n> > -\tif (cfg.width > cio2->maxSize_.width ||\n> > -\t cfg.height > cio2->maxSize_.height) {\n> > +\tconst Size &resolution = cio2->sensor_->resolution();\n> > +\tif (cfg.width > resolution.width ||\n> > +\t cfg.height > resolution.height) {\n> > \t\tLOG(IPU3, Error)\n> > \t\t\t<< \"Invalid stream size: larger than sensor resolution\";\n> > \t\treturn -EINVAL;\n> > @@ -1032,45 +1031,39 @@ int CIO2Device::init(const MediaDevice *media, unsigned int index)\n> >\n> > \tMediaLink *link = links[0];\n> > \tMediaEntity *sensorEntity = link->source()->entity();\n> > -\tif (sensorEntity->function() != MEDIA_ENT_F_CAM_SENSOR)\n> > -\t\treturn -ENODEV;\n> > +\tsensor_ = new CameraSensor(sensorEntity);\n> > +\tret = sensor_->init();\n> > +\tif (ret)\n> > +\t\treturn ret;\n> >\n> > \tret = link->setEnabled(true);\n> > \tif (ret)\n> > \t\treturn ret;\n> >\n> > \t/*\n> > -\t * Now that we're sure a sensor subdevice is connected, make sure it\n> > -\t * produces at least one image format compatible with CIO2 requirements\n> > -\t * and cache the camera maximum size.\n> > +\t * Make sure the sensor produces at least one format compatible with\n> > +\t * the CIO2 requirements.\n> > \t *\n> > +\t * utils::set_overlap requires the ranges to be sorted, keep the\n> > +\t * cio2Codes vector sorted in ascending order.\n> > +\t */\n> > +\tconst std::vector cio2Codes{ MEDIA_BUS_FMT_SBGGR10_1X10,\n> > +\t\t\t\t\t\t MEDIA_BUS_FMT_SGRBG10_1X10,\n> > +\t\t\t\t\t\t MEDIA_BUS_FMT_SGBRG10_1X10,\n> \n> As you mentioned you ordered them, shouldn't SGBR come before SGRB ?\n\nIn alphabetical order, yes, in numerical order, no.\n> \n> Minors apart:\n> Reviewed-by: Jacopo Mondi \n> \n> I'll rebase my multiple stream support series on top of this patches!\n\nLooking forward to that :-)\n\n> > +\t\t\t\t\t\t MEDIA_BUS_FMT_SRGGB10_1X10 };\n> > +\tconst std::vector &sensorCodes = sensor_->mbusCodes();\n> > +\tif (!utils::set_overlap(sensorCodes.begin(), sensorCodes.end(),\n> > +\t\t\t\tcio2Codes.begin(), cio2Codes.end())) {\n> > +\t\tLOG(IPU3, Error)\n> > +\t\t\t<< \"Sensor \" << sensor_->entity()->name()\n> > +\t\t\t<< \" has not format compatible with the IPU3\";\n> > +\t\treturn -EINVAL;\n> > +\t}\n> > +\n> > +\t/*\n> > \t * \\todo Define when to open and close video device nodes, as they\n> > \t * might impact on power consumption.\n> > \t */\n> > -\tsensor_ = new V4L2Subdevice(sensorEntity);\n> > -\tret = sensor_->open();\n> > -\tif (ret)\n> > -\t\treturn ret;\n> > -\n> > -\tfor (auto it : sensor_->formats(0)) {\n> > -\t\tint mbusCode = mediaBusToFormat(it.first);\n> > -\t\tif (mbusCode < 0)\n> > -\t\t\tcontinue;\n> > -\n> > -\t\tfor (const SizeRange &size : it.second) {\n> > -\t\t\tif (maxSize_.width < size.max.width &&\n> > -\t\t\t maxSize_.height < size.max.height) {\n> > -\t\t\t\tmaxSize_ = size.max;\n> > -\t\t\t\tmbusCode_ = mbusCode;\n> > -\t\t\t}\n> > -\t\t}\n> > -\t}\n> > -\tif (maxSize_.width == 0) {\n> > -\t\tLOG(IPU3, Info) << \"Sensor '\" << sensor_->entity()->name()\n> > -\t\t\t\t<< \"' detected, but no supported image format \"\n> > -\t\t\t\t<< \" found: skip camera creation\";\n> > -\t\treturn -ENODEV;\n> > -\t}\n> >\n> > \tcsi2_ = new V4L2Subdevice(csi2Entity);\n> > \tret = csi2_->open();\n> > @@ -1096,47 +1089,19 @@ int CIO2Device::init(const MediaDevice *media, unsigned int index)\n> > int CIO2Device::configure(const StreamConfiguration &config,\n> > \t\t\t V4L2DeviceFormat *outputFormat)\n> > {\n> > -\tunsigned int imageSize = config.width * config.height;\n> > -\tV4L2SubdeviceFormat sensorFormat = {};\n> > -\tunsigned int best = ~0;\n> > +\tV4L2SubdeviceFormat sensorFormat;\n> > \tint ret;\n> >\n> > -\tfor (auto it : sensor_->formats(0)) {\n> > -\t\t/* Only consider formats consumable by the CIO2 unit. */\n> > -\t\tif (mediaBusToFormat(it.first) < 0)\n> > -\t\t\tcontinue;\n> > -\n> > -\t\tfor (const SizeRange &size : it.second) {\n> > -\t\t\t/*\n> > -\t\t\t * Only select formats bigger than the requested sizes\n> > -\t\t\t * as the IPU3 cannot up-scale.\n> > -\t\t\t *\n> > -\t\t\t * \\todo: Unconditionally scale on the sensor as much\n> > -\t\t\t * as possible. This will need to be revisited when\n> > -\t\t\t * implementing the scaling policy.\n> > -\t\t\t */\n> > -\t\t\tif (size.max.width < config.width ||\n> > -\t\t\t size.max.height < config.height)\n> > -\t\t\t\tcontinue;\n> > -\n> > -\t\t\tunsigned int diff = size.max.width * size.max.height\n> > -\t\t\t\t\t - imageSize;\n> > -\t\t\tif (diff >= best)\n> > -\t\t\t\tcontinue;\n> > -\n> > -\t\t\tbest = diff;\n> > -\n> > -\t\t\tsensorFormat.width = size.max.width;\n> > -\t\t\tsensorFormat.height = size.max.height;\n> > -\t\t\tsensorFormat.mbus_code = it.first;\n> > -\t\t}\n> > -\t}\n> > -\n> > \t/*\n> > \t * Apply the selected format to the sensor, the CSI-2 receiver and\n> > \t * the CIO2 output device.\n> > \t */\n> > -\tret = sensor_->setFormat(0, &sensorFormat);\n> > +\tsensorFormat = sensor_->getFormat({ MEDIA_BUS_FMT_SBGGR10_1X10,\n> > +\t\t\t\t\t MEDIA_BUS_FMT_SGBRG10_1X10,\n> > +\t\t\t\t\t MEDIA_BUS_FMT_SGRBG10_1X10,\n> > +\t\t\t\t\t MEDIA_BUS_FMT_SRGGB10_1X10 },\n> > +\t\t\t\t\t Size(config.width, config.height));\n> > +\tret = sensor_->setFormat(&sensorFormat);\n> > \tif (ret)\n> > \t\treturn ret;\n> >","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8B41A60DC6\n\tfor ;\n\tThu, 18 Apr 2019 17:08:37 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 91040333;\n\tThu, 18 Apr 2019 17:08:36 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1555600116;\n\tbh=vMJsibUHrkZdG0h1IOiI4sKzaPwRCNf+k4t3SXfuTQ8=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=HwsFfsCMG+ZyxYTdrxl4Q0mWuMz2dGLE0/iM6W06OAQOe6XsV/kdzGj0IYQlytJRN\n\tIF8Fsfw7+PGFfdg41dZc5UifBJ0ynLQrexs8w8V6vQyNOMNG6Y9BJlPV5JoFnccz9T\n\tuCc1I4v2HOrvQV9Obi4jECehXTwjk2eb+rBguMZQ=","Date":"Thu, 18 Apr 2019 18:08:28 +0300","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190418150828.GT4806@pendragon.ideasonboard.com>","References":"<20190418141437.14014-1-laurent.pinchart@ideasonboard.com>\n\t<20190418141437.14014-13-laurent.pinchart@ideasonboard.com>\n\t<20190418144052.stutpthmeoccnmod@uno.localdomain>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20190418144052.stutpthmeoccnmod@uno.localdomain>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH v3 12/13] libcamera: pipeline: ipu3:\n\tUse the new CameraSensor class","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 18 Apr 2019 15:08:37 -0000"}}]