[{"id":18490,"web_url":"https://patchwork.libcamera.org/comment/18490/","msgid":"<20210802144954.fvvisgy4u77kxzmn@uno.localdomain>","date":"2021-08-02T14:49:54","subject":"Re: [libcamera-devel] [RFC PATCH 2/3] ipu3: cio2: Replicate\n\tCameraSensor::getFormats() to a member function","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"On Fri, Jul 30, 2021 at 01:58:27PM +0530, Umang Jain wrote:\n> This prepares a base to introduce custom selection of sensor format\n> based on platform(soraka or nautilus) constraints. The changes in\n> selection policy will be introduced in a subsequent patch.\n>\n> No functional changes in this patch.\n>\n> Signed-off-by: Umang Jain \n> ---\n> src/libcamera/pipeline/ipu3/cio2.cpp | 101 ++++++++++++++++++++++++++-\n> src/libcamera/pipeline/ipu3/cio2.h | 5 ++\n> 2 files changed, 104 insertions(+), 2 deletions(-)\n>\n> diff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp\n> index 1bcd580e..aef88afd 100644\n> --- a/src/libcamera/pipeline/ipu3/cio2.cpp\n> +++ b/src/libcamera/pipeline/ipu3/cio2.cpp\n> @@ -7,6 +7,8 @@\n>\n> #include \"cio2.h\"\n>\n> +#include \n> +\n\n#include \n#include \n\n> #include \n>\n> #include \n> @@ -120,6 +122,14 @@ int CIO2Device::init(const MediaDevice *media, unsigned int index)\n> \tif (ret)\n> \t\treturn ret;\n>\n> +\tformats_ = sensor_->formats();\n> +\tif (formats_.empty()) {\n> +\t\tLOG(IPU3, Error)\n> +\t\t\t<< \"Sensor \" << sensor_->entity()->name()\n> +\t\t\t<< \"has empty sensor format list\";\n> +\t\treturn -EINVAL;\n> +\t}\n> +\n\nin CameraSensor\n\n\t/* Enumerate, sort and cache media bus codes and sizes. */\n\tformats_ = subdev_->formats(pad_);\n\tif (formats_.empty()) {\n\t\tLOG(CameraSensor, Error) << \"No image format found\";\n\t\treturn -EINVAL;\n\t}\n\n> \t/*\n> \t * Make sure the sensor produces at least one format compatible with\n> \t * the CIO2 requirements.\n> @@ -168,7 +178,7 @@ int CIO2Device::configure(const Size &size, V4L2DeviceFormat *outputFormat)\n> \t * the CIO2 output device.\n> \t */\n> \tstd::vector mbusCodes = utils::map_keys(mbusCodesToPixelFormat);\n> -\tsensorFormat = sensor_->getFormat(mbusCodes, size);\n> +\tsensorFormat = getSensorFormat(mbusCodes, size);\n> \tret = sensor_->setFormat(&sensorFormat);\n> \tif (ret)\n> \t\treturn ret;\n> @@ -206,7 +216,7 @@ StreamConfiguration CIO2Device::generateConfiguration(Size size) const\n>\n> \t/* Query the sensor static information for closest match. */\n> \tstd::vector mbusCodes = utils::map_keys(mbusCodesToPixelFormat);\n> -\tV4L2SubdeviceFormat sensorFormat = sensor_->getFormat(mbusCodes, size);\n> +\tV4L2SubdeviceFormat sensorFormat = getSensorFormat(mbusCodes, size);\n> \tif (!sensorFormat.mbus_code) {\n> \t\tLOG(IPU3, Error) << \"Sensor does not support mbus code\";\n> \t\treturn {};\n> @@ -219,6 +229,93 @@ StreamConfiguration CIO2Device::generateConfiguration(Size size) const\n> \treturn cfg;\n> }\n>\n> +/**\n> + * \\brief Retrieve the best sensor format for a desired output\n> + * \\param[in] mbusCodes The list of acceptable media bus codes\n> + * \\param[in] size The desired size\n> + *\n> + * Media bus codes are selected from \\a mbusCodes, which lists all acceptable\n> + * codes in decreasing order of preference. Media bus codes supported by the\n> + * sensor but not listed in \\a mbusCodes are ignored. If none of the desired\n> + * codes is supported, it returns an error.\n> + *\n> + * \\a size indicates the desired size at the output of the sensor. This method\n> + * selects the best media bus code and size supported by the sensor according\n> + * to the following criteria.\n> + *\n> + * - The desired \\a size shall fit in the sensor output size to avoid the need\n> + * to up-scale.\n> + * - The sensor output size shall match the desired aspect ratio to avoid the\n> + * need to crop the field of view.\n> + * - The sensor output size shall be as small as possible to lower the required\n> + * bandwidth.\n> + * - The desired \\a size shall be supported by one of the media bus code listed\n> + * in \\a mbusCodes.\n> + *\n> + * When multiple media bus codes can produce the same size, the code at the\n> + * lowest position in \\a mbusCodes is selected.\n> + *\n> + * The use of this method is optional, as the above criteria may not match the\n> + * needs of all pipeline handlers. Pipeline handlers may implement custom\n> + * sensor format selection when needed.\n> + *\n> + * The returned sensor output format is guaranteed to be acceptable by the\n> + * setFormat() method without any modification.\n> + *\n> + * \\return The best sensor output format matching the desired media bus codes\n> + * and size on success, or an empty format otherwise.\n> + */\n> +V4L2SubdeviceFormat CIO2Device::getSensorFormat(const std::vector &mbusCodes,\n> +\t\t\t\t\t\tconst Size &size) const\n> +{\n> +\tunsigned int desiredArea = size.width * size.height;\n> +\tunsigned int bestArea = UINT_MAX;\n> +\tfloat desiredRatio = static_cast(size.width) / size.height;\n> +\tfloat bestRatio = FLT_MAX;\n> +\tconst Size *bestSize = nullptr;\n> +\tuint32_t bestCode = 0;\n> +\n> +\tfor (unsigned int code : mbusCodes) {\n> +\t\tconst auto formats = formats_.find(code);\n> +\t\tif (formats == formats_.end())\n> +\t\t\tcontinue;\n> +\n> +\t\tfor (const SizeRange &range : formats->second) {\n> +\t\t\tconst Size &sz = range.max;\n> +\n> +\t\t\tif (sz.width < size.width || sz.height < size.height)\n> +\t\t\t\tcontinue;\n> +\n> +\t\t\tfloat ratio = static_cast(sz.width) / sz.height;\n> +\t\t\tfloat ratioDiff = fabsf(ratio - desiredRatio);\n> +\t\t\tunsigned int area = sz.width * sz.height;\n> +\t\t\tunsigned int areaDiff = area - desiredArea;\n> +\n> +\t\t\tif (ratioDiff > bestRatio)\n> +\t\t\t\tcontinue;\n> +\n> +\t\t\tif (ratioDiff < bestRatio || areaDiff < bestArea) {\n> +\t\t\t\tbestRatio = ratioDiff;\n> +\t\t\t\tbestArea = areaDiff;\n> +\t\t\t\tbestSize = &sz;\n> +\t\t\t\tbestCode = code;\n> +\t\t\t}\n> +\t\t}\n> +\t}\n> +\n> +\tif (!bestSize) {\n> +\t\tLOG(IPU3, Debug) << \"No supported format or size found\";\n> +\t\treturn {};\n> +\t}\n> +\n> +\tV4L2SubdeviceFormat format{\n> +\t\t.mbus_code = bestCode,\n> +\t\t.size = *bestSize,\n> +\t};\n> +\n> +\treturn format;\n> +}\n> +\n\nI think a verbatim copy of the function implemented in CameraSensor is\na good idea to highlight changes on top that happen in the subsequent\npatches\n\nI'm always a bit hesitant about using 'get' in functions that perform\ncomputations, as a getter to me is just a field accessor. But that might\njust be me.\n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n\n> int CIO2Device::exportBuffers(unsigned int count,\n> \t\t\t std::vector> *buffers)\n> {\n> diff --git a/src/libcamera/pipeline/ipu3/cio2.h b/src/libcamera/pipeline/ipu3/cio2.h\n> index f28e9f1d..f3f12706 100644\n> --- a/src/libcamera/pipeline/ipu3/cio2.h\n> +++ b/src/libcamera/pipeline/ipu3/cio2.h\n> @@ -45,6 +45,9 @@ public:\n> \tint exportBuffers(unsigned int count,\n> \t\t\t std::vector> *buffers);\n>\n> +\tV4L2SubdeviceFormat getSensorFormat(const std::vector &mbusCodes,\n> +\t\t\t\t\t const Size &size) const;\n> +\n> \tint start();\n> \tint stop();\n>\n> @@ -67,6 +70,8 @@ private:\n> \tstd::unique_ptr csi2_;\n> \tstd::unique_ptr output_;\n>\n> +\tV4L2Subdevice::Formats formats_;\n> +\n> \tstd::vector> buffers_;\n> \tstd::queue availableBuffers_;\n> };\n> --\n> 2.31.0\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 51AFAC3232\n\tfor ;\n\tMon, 2 Aug 2021 14:49:13 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D721C687CC;\n\tMon, 2 Aug 2021 16:49:12 +0200 (CEST)","from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net\n\t[217.70.183.199])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5089A6026F\n\tfor ;\n\tMon, 2 Aug 2021 16:49:11 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 8CE7FFF806;\n\tMon, 2 Aug 2021 14:49:10 +0000 (UTC)"],"Date":"Mon, 2 Aug 2021 16:49:54 +0200","From":"Jacopo Mondi ","To":"Umang Jain ","Message-ID":"<20210802144954.fvvisgy4u77kxzmn@uno.localdomain>","References":"<20210730082832.152626-1-umang.jain@ideasonboard.com>\n\t<20210730082832.152626-3-umang.jain@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210730082832.152626-3-umang.jain@ideasonboard.com>","Subject":"Re: [libcamera-devel] [RFC PATCH 2/3] ipu3: cio2: Replicate\n\tCameraSensor::getFormats() to a member function","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]