[{"id":30075,"web_url":"https://patchwork.libcamera.org/comment/30075/","msgid":"<171934702960.739659.5031072406833493240@ping.linuxembedded.co.uk>","date":"2024-06-25T20:23:49","subject":"Re: [PATCH v2 2/6] libcamera: mali-c55: Limit ISP input size","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Jacopo Mondi (2024-06-25 20:04:15)\n> The Mali-C55 ISP has an input size limit of 640x480.\n> \n> Filter out resolutions smaller than this when selecting the\n> sensor format. While at it, rename 'maxYuvSize' to a more\n> appropriate 'minSensorSize'.\n> \n> Signed-off-by: Jacopo Mondi \n> ---\n> src/libcamera/pipeline/mali-c55/mali-c55.cpp | 37 ++++++++++++--------\n> 1 file changed, 23 insertions(+), 14 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/mali-c55/mali-c55.cpp b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n> index 1c1fef2337f0..91f2ebd6fd26 100644\n> --- a/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n> +++ b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n> @@ -79,6 +79,7 @@ const std::map maliC55FmtToCode = {\n> { formats::SGRBG16, MEDIA_BUS_FMT_SGRBG16_1X16 },\n> };\n> \n> +constexpr Size kMaliC55MinInputSize = { 640, 480 };\n> constexpr Size kMaliC55MinSize = { 128, 128 };\n> constexpr Size kMaliC55MaxSize = { 8192, 8192 };\n> constexpr unsigned int kMaliC55ISPInternalFormat = MEDIA_BUS_FMT_RGB121212_1X36;\n> @@ -265,13 +266,16 @@ PixelFormat MaliC55CameraData::adjustRawFormat(const PixelFormat &rawFmt) const\n> return rawFmt;\n> }\n> \n> -Size MaliC55CameraData::adjustRawSizes(const PixelFormat &rawFmt, const Size &rawSize) const\n> +Size MaliC55CameraData::adjustRawSizes(const PixelFormat &rawFmt, const Size &size) const\n> {\n> /* Just make sure the format is supported. */\n> auto it = maliC55FmtToCode.find(rawFmt);\n> if (it == maliC55FmtToCode.end())\n> return {};\n> \n> + /* Expand the RAW size to the minimum ISP input size. */\n> + Size rawSize = size.expandedTo(kMaliC55MinInputSize);\n> +\n> /* Check if the size is natively supported. */\n> unsigned int rawCode = it->second;\n> const auto rawSizes = sizes(rawCode);\n> @@ -282,14 +286,14 @@ Size MaliC55CameraData::adjustRawSizes(const PixelFormat &rawFmt, const Size &ra\n> /* Or adjust it to the closest supported size. */\n> uint16_t distance = std::numeric_limits::max();\n> Size bestSize;\n> - for (const Size &size : rawSizes) {\n> + for (const Size &sz : rawSizes) {\n> uint16_t dist = std::abs(static_cast(rawSize.width) -\n> - static_cast(size.width)) +\n> + static_cast(sz.width)) +\n> std::abs(static_cast(rawSize.height) -\n> - static_cast(size.height));\n> + static_cast(sz.height));\n> if (dist < distance) {\n> dist = distance;\n> - bestSize = size;\n> + bestSize = sz;\n> }\n> }\n> \n> @@ -376,8 +380,13 @@ CameraConfiguration::Status MaliC55CameraConfiguration::validate()\n> frPipeAvailable = false;\n> }\n> \n> - /* Adjust processed streams. */\n> - Size maxYuvSize;\n> + /*\n> + * Adjust processed streams.\n> + *\n> + * Compute the minimum sensor size to be later used to select the\n> + * sensor configuration.\n> + */\n> + Size minSensorSize = kMaliC55MinInputSize;\n> for (StreamConfiguration &config : config_) {\n> if (isFormatRaw(config.pixelFormat))\n> continue;\n> @@ -399,8 +408,8 @@ CameraConfiguration::Status MaliC55CameraConfiguration::validate()\n> status = Adjusted;\n> }\n> \n> - if (maxYuvSize < size)\n> - maxYuvSize = size;\n> + if (minSensorSize < size)\n> + minSensorSize = size;\n\nThis doesn't read well to me yet. Or maybe I'm tired, or it needs a comment.\n\nIf the miniumSensorSize is smaller than size we make the\nminiumSensorSize bigger...\n\nisn't a miniumSensorSize a constant? What is size here? The context\nisn't very helpful as you've changed a different function above to also\nhave a parameter passed in now called size ... but I think that's a\n'different' size to this one...\n\n> \n> if (frPipeAvailable) {\n> config.setStream(const_cast(&data_->frStream_));\n> @@ -416,7 +425,7 @@ CameraConfiguration::Status MaliC55CameraConfiguration::validate()\n> if (rawConfig) {\n> const auto it = maliC55FmtToCode.find(rawConfig->pixelFormat);\n> sensorFormat_.code = it->second;\n> - sensorFormat_.size = rawConfig->size;\n> + sensorFormat_.size = rawConfig->size.expandedTo(minSensorSize);\n> \n> return status;\n> }\n> @@ -431,13 +440,13 @@ CameraConfiguration::Status MaliC55CameraConfiguration::validate()\n> Size bestSize;\n> for (const auto &size : sizes) {\n> /* Skip sensor sizes that are smaller than the max YUV size. */\n\nShould this comment change too ?\n\n> - if (maxYuvSize.width > size.width ||\n> - maxYuvSize.height > size.height)\n> + if (minSensorSize.width > size.width ||\n> + minSensorSize.height > size.height)\n> continue;\n> \n> - uint16_t dist = std::abs(static_cast(maxYuvSize.width) -\n> + uint16_t dist = std::abs(static_cast(minSensorSize.width) -\n> static_cast(size.width)) +\n> - std::abs(static_cast(maxYuvSize.height) -\n> + std::abs(static_cast(minSensorSize.height) -\n> static_cast(size.height));\n> if (dist < distance) {\n> dist = distance;\n> -- \n> 2.45.2\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 44184BDB1D\n\tfor ;\n\tTue, 25 Jun 2024 20:23:55 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 64658654A9;\n\tTue, 25 Jun 2024 22:23:54 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id ABE07654A1\n\tfor ;\n\tTue, 25 Jun 2024 22:23:52 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D2A7E7E0;\n\tTue, 25 Jun 2024 22:23:29 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"igHUFNVo\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1719347009;\n\tbh=ydv0bkbzvYxYwhMpixaC1sKzQpor31f+jpDPBoZc5aI=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=igHUFNVoysLEnKJLZXaFAbRZxs8UAqCbuJXENdbMB29oybBgWM0el/YjZeJgcpmlk\n\tENUCuJjJpEpxDZs2UPMjfuck1DaXAdGWSx7tn4NuFrb4mzeOd90MOFndhgUvItyS2B\n\ty3jszfDn5cr+7ygAjke7Yqrq3FhUeeHHmERLkSj4=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20240625190423.291429-3-jacopo.mondi@ideasonboard.com>","References":"<20240625190423.291429-1-jacopo.mondi@ideasonboard.com>\n\t<20240625190423.291429-3-jacopo.mondi@ideasonboard.com>","Subject":"Re: [PATCH v2 2/6] libcamera: mali-c55: Limit ISP input size","From":"Kieran Bingham ","Cc":"Jacopo Mondi ","To":"Jacopo Mondi ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Tue, 25 Jun 2024 21:23:49 +0100","Message-ID":"<171934702960.739659.5031072406833493240@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":30086,"web_url":"https://patchwork.libcamera.org/comment/30086/","msgid":"","date":"2024-06-26T07:17:38","subject":"Re: [PATCH v2 2/6] libcamera: mali-c55: Limit ISP input size","submitter":{"id":143,"url":"https://patchwork.libcamera.org/api/people/143/","name":"Jacopo Mondi","email":"jacopo.mondi@ideasonboard.com"},"content":"Hi Kieran\n\nOn Tue, Jun 25, 2024 at 09:23:49PM GMT, Kieran Bingham wrote:\n> Quoting Jacopo Mondi (2024-06-25 20:04:15)\n> > The Mali-C55 ISP has an input size limit of 640x480.\n> >\n> > Filter out resolutions smaller than this when selecting the\n> > sensor format. While at it, rename 'maxYuvSize' to a more\n> > appropriate 'minSensorSize'.\n> >\n> > Signed-off-by: Jacopo Mondi \n> > ---\n> > src/libcamera/pipeline/mali-c55/mali-c55.cpp | 37 ++++++++++++--------\n> > 1 file changed, 23 insertions(+), 14 deletions(-)\n> >\n> > diff --git a/src/libcamera/pipeline/mali-c55/mali-c55.cpp b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n> > index 1c1fef2337f0..91f2ebd6fd26 100644\n> > --- a/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n> > +++ b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n> > @@ -79,6 +79,7 @@ const std::map maliC55FmtToCode = {\n> > { formats::SGRBG16, MEDIA_BUS_FMT_SGRBG16_1X16 },\n> > };\n> >\n> > +constexpr Size kMaliC55MinInputSize = { 640, 480 };\n> > constexpr Size kMaliC55MinSize = { 128, 128 };\n> > constexpr Size kMaliC55MaxSize = { 8192, 8192 };\n> > constexpr unsigned int kMaliC55ISPInternalFormat = MEDIA_BUS_FMT_RGB121212_1X36;\n> > @@ -265,13 +266,16 @@ PixelFormat MaliC55CameraData::adjustRawFormat(const PixelFormat &rawFmt) const\n> > return rawFmt;\n> > }\n> >\n> > -Size MaliC55CameraData::adjustRawSizes(const PixelFormat &rawFmt, const Size &rawSize) const\n> > +Size MaliC55CameraData::adjustRawSizes(const PixelFormat &rawFmt, const Size &size) const\n> > {\n> > /* Just make sure the format is supported. */\n> > auto it = maliC55FmtToCode.find(rawFmt);\n> > if (it == maliC55FmtToCode.end())\n> > return {};\n> >\n> > + /* Expand the RAW size to the minimum ISP input size. */\n> > + Size rawSize = size.expandedTo(kMaliC55MinInputSize);\n> > +\n> > /* Check if the size is natively supported. */\n> > unsigned int rawCode = it->second;\n> > const auto rawSizes = sizes(rawCode);\n> > @@ -282,14 +286,14 @@ Size MaliC55CameraData::adjustRawSizes(const PixelFormat &rawFmt, const Size &ra\n> > /* Or adjust it to the closest supported size. */\n> > uint16_t distance = std::numeric_limits::max();\n> > Size bestSize;\n> > - for (const Size &size : rawSizes) {\n> > + for (const Size &sz : rawSizes) {\n> > uint16_t dist = std::abs(static_cast(rawSize.width) -\n> > - static_cast(size.width)) +\n> > + static_cast(sz.width)) +\n> > std::abs(static_cast(rawSize.height) -\n> > - static_cast(size.height));\n> > + static_cast(sz.height));\n> > if (dist < distance) {\n> > dist = distance;\n> > - bestSize = size;\n> > + bestSize = sz;\n> > }\n> > }\n> >\n> > @@ -376,8 +380,13 @@ CameraConfiguration::Status MaliC55CameraConfiguration::validate()\n> > frPipeAvailable = false;\n> > }\n> >\n> > - /* Adjust processed streams. */\n> > - Size maxYuvSize;\n> > + /*\n> > + * Adjust processed streams.\n> > + *\n> > + * Compute the minimum sensor size to be later used to select the\n> > + * sensor configuration.\n> > + */\n> > + Size minSensorSize = kMaliC55MinInputSize;\n> > for (StreamConfiguration &config : config_) {\n> > if (isFormatRaw(config.pixelFormat))\n> > continue;\n> > @@ -399,8 +408,8 @@ CameraConfiguration::Status MaliC55CameraConfiguration::validate()\n> > status = Adjusted;\n> > }\n> >\n> > - if (maxYuvSize < size)\n> > - maxYuvSize = size;\n> > + if (minSensorSize < size)\n> > + minSensorSize = size;\n>\n> This doesn't read well to me yet. Or maybe I'm tired, or it needs a comment.\n\nA comment like ?\n\n * Compute the minimum sensor size to be later used to select the\n * sensor configuration.\n>\n> If the miniumSensorSize is smaller than size we make the\n> miniumSensorSize bigger...\n\nminSensorSize is the minimum required sensor output size. As the ISP\ncannot upscale:\n\n- Initialize it to the min ISP input size\n- Walk all the YUV streams and search for the largest YUV size\n\nThen search for a sensor mode large enough\n>\n> isn't a miniumSensorSize a constant? What is size here? The context\n> isn't very helpful as you've changed a different function above to also\n> have a parameter passed in now called size ... but I think that's a\n> 'different' size to this one...\n\nThat change is self-contained. The function is not called from here.\n\n>\n> >\n> > if (frPipeAvailable) {\n> > config.setStream(const_cast(&data_->frStream_));\n> > @@ -416,7 +425,7 @@ CameraConfiguration::Status MaliC55CameraConfiguration::validate()\n> > if (rawConfig) {\n> > const auto it = maliC55FmtToCode.find(rawConfig->pixelFormat);\n> > sensorFormat_.code = it->second;\n> > - sensorFormat_.size = rawConfig->size;\n> > + sensorFormat_.size = rawConfig->size.expandedTo(minSensorSize);\n> >\n> > return status;\n> > }\n> > @@ -431,13 +440,13 @@ CameraConfiguration::Status MaliC55CameraConfiguration::validate()\n> > Size bestSize;\n> > for (const auto &size : sizes) {\n> > /* Skip sensor sizes that are smaller than the max YUV size. */\n>\n> Should this comment change too ?\n\nAh yes, maybe yes.\n\n>\n> > - if (maxYuvSize.width > size.width ||\n> > - maxYuvSize.height > size.height)\n> > + if (minSensorSize.width > size.width ||\n> > + minSensorSize.height > size.height)\n> > continue;\n> >\n> > - uint16_t dist = std::abs(static_cast(maxYuvSize.width) -\n> > + uint16_t dist = std::abs(static_cast(minSensorSize.width) -\n> > static_cast(size.width)) +\n> > - std::abs(static_cast(maxYuvSize.height) -\n> > + std::abs(static_cast(minSensorSize.height) -\n> > static_cast(size.height));\n> > if (dist < distance) {\n> > dist = distance;\n> > --\n> > 2.45.2\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 2CBD5BDB1D\n\tfor ;\n\tWed, 26 Jun 2024 07:17:43 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D20B3654AC;\n\tWed, 26 Jun 2024 09:17:42 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7AA68619E5\n\tfor ;\n\tWed, 26 Jun 2024 09:17:41 +0200 (CEST)","from ideasonboard.com (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7C514FD6;\n\tWed, 26 Jun 2024 09:17:18 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"ZqAOX5ma\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1719386238;\n\tbh=xKTYv7PEFQNyzJ72VZp1aIsEqgviBygCHlrSRElbfTE=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=ZqAOX5maroC3ep6kegOHW1aR3/JgM/gUrJdKFgVWpHVSUKr30g8eogzJOfuYMOav+\n\tMkOGfOfl+Ngk5GDIBo/qs9UVmFHRsSuANL2ZtoA4sSSG2M9y4hS9WWahaw7ZfsON0/\n\tkbQYzxviCvvb+ACd9kMWSDX7M0rhVDV5AeZUv2Qg=","Date":"Wed, 26 Jun 2024 09:17:38 +0200","From":"Jacopo Mondi ","To":"Kieran Bingham ","Cc":"Jacopo Mondi , \n\tlibcamera-devel@lists.libcamera.org","Subject":"Re: [PATCH v2 2/6] libcamera: mali-c55: Limit ISP input size","Message-ID":"","References":"<20240625190423.291429-1-jacopo.mondi@ideasonboard.com>\n\t<20240625190423.291429-3-jacopo.mondi@ideasonboard.com>\n\t<171934702960.739659.5031072406833493240@ping.linuxembedded.co.uk>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<171934702960.739659.5031072406833493240@ping.linuxembedded.co.uk>","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]