Patch Detail
Show a patch.
GET /api/1.1/patches/21905/?format=api
{ "id": 21905, "url": "https://patchwork.libcamera.org/api/1.1/patches/21905/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21905/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20241115101334.453104-3-dan.scally@ideasonboard.com>", "date": "2024-11-15T10:13:22", "name": "[v6,02/14] libcamera: mali-c55: Limit ISP input size", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "d7958e700bef2223929935264ca7d59d4827908f", "submitter": { "id": 156, "url": "https://patchwork.libcamera.org/api/1.1/people/156/?format=api", "name": "Dan Scally", "email": "dan.scally@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21905/mbox/", "series": [ { "id": 4793, "url": "https://patchwork.libcamera.org/api/1.1/series/4793/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4793", "date": "2024-11-15T10:13:20", "name": "Miscellaneous Mali-C55 Pipeline Fixes", "version": 6, "mbox": "https://patchwork.libcamera.org/series/4793/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21905/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21905/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 6FCBCC0F1B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 15 Nov 2024 10:13:56 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 05FC865880;\n\tFri, 15 Nov 2024 11:13:55 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 58F3765865\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 15 Nov 2024 11:13:48 +0100 (CET)", "from mail.ideasonboard.com\n\t(cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net [86.13.91.161])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7559CFC5;\n\tFri, 15 Nov 2024 11:13:33 +0100 (CET)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"C3vxoET3\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1731665613;\n\tbh=K1sbtq5yxj+kwESVaQF000/mTHHODuQSKMpDcF6YARw=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=C3vxoET3At3EXmHP+GdaZinOi8gWR1m6e2nKuyjfWv9tqcP88HeQMGJNaKBwyZGzw\n\t5zJcL1kFNM1sY9icZLXO6ThmVMTqRYOghQC810eioQnJhjOkr/pOv0M0X01uJzXP3B\n\tsLsvz61WumZotEp2gjLTfsiWQGQ/tz45ttv1xaCg=", "From": "Daniel Scally <dan.scally@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Anthony.McGivern@arm.com, Jacopo Mondi <jacopo.mondi@ideasonboard.com>, \n\tDaniel Scally <dan.scally@ideasonboard.com>,\n\tUmang Jain <umang.jain@ideasonboard.com>", "Subject": "[PATCH v6 02/14] libcamera: mali-c55: Limit ISP input size", "Date": "Fri, 15 Nov 2024 10:13:22 +0000", "Message-Id": "<20241115101334.453104-3-dan.scally@ideasonboard.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20241115101334.453104-1-dan.scally@ideasonboard.com>", "References": "<20241115101334.453104-1-dan.scally@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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "From: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\n\nThe Mali-C55 ISP has a minimum 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\nReviewed-by: Daniel Scally <dan.scally@ideasonboard.com>\nReviewed-by: Umang Jain <umang.jain@ideasonboard.com>\nSigned-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\nSigned-off-by: Daniel Scally <dan.scally@ideasonboard.com>\n---\nChanges in v6:\n\n\t- None\n\nChanges in v5:\n\n\t- None\n\n src/libcamera/pipeline/mali-c55/mali-c55.cpp | 38 ++++++++++++--------\n 1 file changed, 23 insertions(+), 15 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/mali-c55/mali-c55.cpp b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\nindex 662b34ef..44f56ab7 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<libcamera::PixelFormat, unsigned int> 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@@ -264,13 +265,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@@ -281,14 +285,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<uint16_t>::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<int>(rawSize.width) -\n-\t\t\t\t\t static_cast<int>(size.width)) +\n+\t\t\t\t\t static_cast<int>(sz.width)) +\n \t\t\t\tstd::abs(static_cast<int>(rawSize.height) -\n-\t\t\t\t\t static_cast<int>(size.height));\n+\t\t\t\t\t static_cast<int>(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@@ -375,8 +379,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@@ -398,8 +407,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<Stream *>(&data_->frStream_));\n@@ -415,7 +424,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@@ -429,14 +438,13 @@ CameraConfiguration::Status MaliC55CameraConfiguration::validate()\n \tconst auto sizes = data_->sizes(it->second);\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<int>(maxYuvSize.width) -\n+\t\tuint16_t dist = std::abs(static_cast<int>(minSensorSize.width) -\n \t\t\t\t\t static_cast<int>(size.width)) +\n-\t\t\t\tstd::abs(static_cast<int>(maxYuvSize.height) -\n+\t\t\t\tstd::abs(static_cast<int>(minSensorSize.height) -\n \t\t\t\t\t static_cast<int>(size.height));\n \t\tif (dist < distance) {\n \t\t\tdist = distance;\n", "prefixes": [ "v6", "02/14" ] }