{"id":20388,"url":"https://patchwork.libcamera.org/api/1.1/patches/20388/?format=json","web_url":"https://patchwork.libcamera.org/patch/20388/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20240625190423.291429-3-jacopo.mondi@ideasonboard.com>","date":"2024-06-25T19:04:15","name":"[v2,2/6] libcamera: mali-c55: Limit ISP input size","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"d1556bc5eae7a253dddeb07511421aefff295dff","submitter":{"id":143,"url":"https://patchwork.libcamera.org/api/1.1/people/143/?format=json","name":"Jacopo Mondi","email":"jacopo.mondi@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/20388/mbox/","series":[{"id":4418,"url":"https://patchwork.libcamera.org/api/1.1/series/4418/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4418","date":"2024-06-25T19:04:13","name":"Miscellaneous Mali-C55 Pipeline Fixes","version":2,"mbox":"https://patchwork.libcamera.org/series/4418/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/20388/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/20388/checks/","tags":{},"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 BA86ABDB1D\n\tfor ;\n\tTue, 25 Jun 2024 19:04:43 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EE893654AC;\n\tTue, 25 Jun 2024 21:04:39 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7E9BF654A1\n\tfor ;\n\tTue, 25 Jun 2024 21:04:36 +0200 (CEST)","from localhost.localdomain (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id CB4EC512;\n\tTue, 25 Jun 2024 21:04:13 +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=\"TVDuC2vG\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1719342254;\n\tbh=IBll4eALAwqey4L4XUudogs8XGInIa4oRRqbXq9kUQE=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=TVDuC2vGq7SCnH2FMAYhf8/2wrmlcZQxA4mgLKmTdAUXCGA4iXsJMM763HVn98/LR\n\ta0mIj/ZJKAVI6UhNk13ZAn0xsvu1aLYcePELXE53J4n67dGIqfg/uwGlrfg4/q+eHC\n\tLg0BSCoww0ZdZ9X8t23M2jUtM3Ef3/opE8WJMW6Q=","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Cc":"Jacopo Mondi ","Subject":"[PATCH v2 2/6] libcamera: mali-c55: Limit ISP input size","Date":"Tue, 25 Jun 2024 21:04:15 +0200","Message-ID":"<20240625190423.291429-3-jacopo.mondi@ideasonboard.com>","X-Mailer":"git-send-email 2.45.2","In-Reply-To":"<20240625190423.291429-1-jacopo.mondi@ideasonboard.com>","References":"<20240625190423.291429-1-jacopo.mondi@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","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\" "},"content":"The Mali-C55 ISP has an input size limit of 640x480.\n\nFilter out resolutions smaller than this when selecting the\nsensor format. While at it, rename 'maxYuvSize' to a more\nappropriate 'minSensorSize'.\n\nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/pipeline/mali-c55/mali-c55.cpp | 37 ++++++++++++--------\n 1 file changed, 23 insertions(+), 14 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/mali-c55/mali-c55.cpp b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\nindex 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 \t{ 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 \treturn 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 \t/* Just make sure the format is supported. */\n \tauto it = maliC55FmtToCode.find(rawFmt);\n \tif (it == maliC55FmtToCode.end())\n \t\treturn {};\n \n+\t/* Expand the RAW size to the minimum ISP input size. */\n+\tSize rawSize = size.expandedTo(kMaliC55MinInputSize);\n+\n \t/* Check if the size is natively supported. */\n \tunsigned int rawCode = it->second;\n \tconst auto rawSizes = sizes(rawCode);\n@@ -282,14 +286,14 @@ Size MaliC55CameraData::adjustRawSizes(const PixelFormat &rawFmt, const Size &ra\n \t/* Or adjust it to the closest supported size. */\n \tuint16_t distance = std::numeric_limits::max();\n \tSize bestSize;\n-\tfor (const Size &size : rawSizes) {\n+\tfor (const Size &sz : rawSizes) {\n \t\tuint16_t dist = std::abs(static_cast(rawSize.width) -\n-\t\t\t\t\t static_cast(size.width)) +\n+\t\t\t\t\t static_cast(sz.width)) +\n \t\t\t\tstd::abs(static_cast(rawSize.height) -\n-\t\t\t\t\t static_cast(size.height));\n+\t\t\t\t\t static_cast(sz.height));\n \t\tif (dist < distance) {\n \t\t\tdist = distance;\n-\t\t\tbestSize = size;\n+\t\t\tbestSize = sz;\n \t\t}\n \t}\n \n@@ -376,8 +380,13 @@ CameraConfiguration::Status MaliC55CameraConfiguration::validate()\n \t\tfrPipeAvailable = false;\n \t}\n \n-\t/* Adjust processed streams. */\n-\tSize maxYuvSize;\n+\t/*\n+\t * Adjust processed streams.\n+\t *\n+\t * Compute the minimum sensor size to be later used to select the\n+\t * sensor configuration.\n+\t */\n+\tSize minSensorSize = kMaliC55MinInputSize;\n \tfor (StreamConfiguration &config : config_) {\n \t\tif (isFormatRaw(config.pixelFormat))\n \t\t\tcontinue;\n@@ -399,8 +408,8 @@ CameraConfiguration::Status MaliC55CameraConfiguration::validate()\n \t\t\tstatus = Adjusted;\n \t\t}\n \n-\t\tif (maxYuvSize < size)\n-\t\t\tmaxYuvSize = size;\n+\t\tif (minSensorSize < size)\n+\t\t\tminSensorSize = size;\n \n \t\tif (frPipeAvailable) {\n \t\t\tconfig.setStream(const_cast(&data_->frStream_));\n@@ -416,7 +425,7 @@ CameraConfiguration::Status MaliC55CameraConfiguration::validate()\n \tif (rawConfig) {\n \t\tconst auto it = maliC55FmtToCode.find(rawConfig->pixelFormat);\n \t\tsensorFormat_.code = it->second;\n-\t\tsensorFormat_.size = rawConfig->size;\n+\t\tsensorFormat_.size = rawConfig->size.expandedTo(minSensorSize);\n \n \t\treturn status;\n \t}\n@@ -431,13 +440,13 @@ CameraConfiguration::Status MaliC55CameraConfiguration::validate()\n \tSize bestSize;\n \tfor (const auto &size : sizes) {\n \t\t/* Skip sensor sizes that are smaller than the max YUV size. */\n-\t\tif (maxYuvSize.width > size.width ||\n-\t\t maxYuvSize.height > size.height)\n+\t\tif (minSensorSize.width > size.width ||\n+\t\t minSensorSize.height > size.height)\n \t\t\tcontinue;\n \n-\t\tuint16_t dist = std::abs(static_cast(maxYuvSize.width) -\n+\t\tuint16_t dist = std::abs(static_cast(minSensorSize.width) -\n \t\t\t\t\t static_cast(size.width)) +\n-\t\t\t\tstd::abs(static_cast(maxYuvSize.height) -\n+\t\t\t\tstd::abs(static_cast(minSensorSize.height) -\n \t\t\t\t\t static_cast(size.height));\n \t\tif (dist < distance) {\n \t\t\tdist = distance;\n","prefixes":["v2","2/6"]}