Patch Detail
Show a patch.
GET /api/patches/24580/?format=api
{ "id": 24580, "url": "https://patchwork.libcamera.org/api/patches/24580/?format=api", "web_url": "https://patchwork.libcamera.org/patch/24580/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20251010113332.3030598-3-paul.elder@ideasonboard.com>", "date": "2025-10-10T11:33:30", "name": "[v3,2/2] ipa: ipu3, mali-c55, rkisp1, rpi: Fix reporting non-scalar controls", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "675e8275b4f8628d22a33fae6b3ce0fc95ecfe6e", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/24580/mbox/", "series": [ { "id": 5483, "url": "https://patchwork.libcamera.org/api/series/5483/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5483", "date": "2025-10-10T11:33:28", "name": "Fix ControlSerializer deserializing array controls", "version": 3, "mbox": "https://patchwork.libcamera.org/series/5483/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/24580/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/24580/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 A3814C3264\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 10 Oct 2025 11:33:53 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6B04B6B61A;\n\tFri, 10 Oct 2025 13:33:53 +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 8E59B6B5F8\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 10 Oct 2025 13:33:51 +0200 (CEST)", "from neptunite.hamster-moth.ts.net (unknown\n\t[IPv6:2404:7a81:160:2100:fa2a:8f34:95fc:6e6b])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D6D4C664;\n\tFri, 10 Oct 2025 13:32:14 +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=\"cGlsXWiR\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1760095936;\n\tbh=JZSXa447rKcBPwE5DUxJlwIItRdq1GulLAfgrgPR4+w=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=cGlsXWiRpcYMOMEXnTPeOv7r3Iq2PxvCkv+sQtWCygX7knqIsntnpVk3W1BgZuJgZ\n\to6/sA/C0fk7zpGddJYFR/h3WwgBVjJO78DvhdZab6obTkr7ZTQ+8JOHZhwvdL9FwWf\n\tSvdMb8QJflKJgFWmsxnW9IEyLTBNU+VAoa/k0g7w=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Paul Elder <paul.elder@ideasonboard.com>, barnabas.pocze@ideasonboard.com", "Subject": "[PATCH v3 2/2] ipa: ipu3, mali-c55, rkisp1,\n\trpi: Fix reporting non-scalar controls", "Date": "Fri, 10 Oct 2025 20:33:30 +0900", "Message-ID": "<20251010113332.3030598-3-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.47.2", "In-Reply-To": "<20251010113332.3030598-1-paul.elder@ideasonboard.com>", "References": "<20251010113332.3030598-1-paul.elder@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": "The ControlInfos of non-scalar controls that are reported in controls()\nmust have non-scalar default values for controls that have a defined\nsize.\n\nCurrently this is relevant to the following controls:\n- ColourGains\n- ColourCorrectionMatrix\n- FrameDurationLimits\n\nA mismatch of scalarness in these fields causes deserialization errors\nin ControlSerializer which manifest when IPAs are run in isolation.\n\nFix the scalarness of these controls where relevant.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n---\nNo change in v3\n\nNo change in v2\n---\n src/ipa/ipu3/ipu3.cpp | 4 +++-\n src/ipa/mali-c55/mali-c55.cpp | 5 ++++-\n src/ipa/rkisp1/algorithms/awb.cpp | 5 ++++-\n src/ipa/rkisp1/rkisp1.cpp | 4 +++-\n src/ipa/rpi/common/ipa_base.cpp | 7 ++++++-\n 5 files changed, 20 insertions(+), 5 deletions(-)", "diff": "diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex 1cae08bf255f..e71639a16522 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -20,6 +20,7 @@\n \n #include <libcamera/base/file.h>\n #include <libcamera/base/log.h>\n+#include <libcamera/base/span.h>\n #include <libcamera/base/utils.h>\n \n #include <libcamera/control_ids.h>\n@@ -280,10 +281,11 @@ void IPAIPU3::updateControls(const IPACameraSensorInfo &sensorInfo,\n \t\tuint64_t frameSize = lineLength * frameHeights[i];\n \t\tframeDurations[i] = frameSize / (sensorInfo.pixelRate / 1000000U);\n \t}\n+\tstd::array<int64_t, 2> defFrameDurations = { frameDurations[2], frameDurations[2] };\n \n \tcontrols[&controls::FrameDurationLimits] = ControlInfo(frameDurations[0],\n \t\t\t\t\t\t\t frameDurations[1],\n-\t\t\t\t\t\t\t frameDurations[2]);\n+\t\t\t\t\t\t\t Span<const int64_t, 2>{ defFrameDurations });\n \n \tcontrols.merge(context_.ctrlMap);\n \t*ipaControls = ControlInfoMap(std::move(controls), controls::controls);\ndiff --git a/src/ipa/mali-c55/mali-c55.cpp b/src/ipa/mali-c55/mali-c55.cpp\nindex 7d45e7310aec..c63d3b2bb7be 100644\n--- a/src/ipa/mali-c55/mali-c55.cpp\n+++ b/src/ipa/mali-c55/mali-c55.cpp\n@@ -5,6 +5,7 @@\n * Mali-C55 ISP image processing algorithms\n */\n \n+#include <array>\n #include <map>\n #include <string.h>\n #include <vector>\n@@ -14,6 +15,7 @@\n \n #include <libcamera/base/file.h>\n #include <libcamera/base/log.h>\n+#include <libcamera/base/span.h>\n \n #include <libcamera/control_ids.h>\n #include <libcamera/ipa/ipa_interface.h>\n@@ -234,9 +236,10 @@ void IPAMaliC55::updateControls(const IPACameraSensorInfo &sensorInfo,\n \t\tframeDurations[i] = frameSize / (sensorInfo.pixelRate / 1000000U);\n \t}\n \n+\tstd::array<int64_t, 2> defFrameDurations = { frameDurations[2], frameDurations[2] };\n \tctrlMap[&controls::FrameDurationLimits] = ControlInfo(frameDurations[0],\n \t\t\t\t\t\t\t frameDurations[1],\n-\t\t\t\t\t\t\t frameDurations[2]);\n+\t\t\t\t\t\t\t Span<const int64_t, 2>{ defFrameDurations });\n \n \t/*\n \t * Compute exposure time limits from the V4L2_CID_EXPOSURE control\ndiff --git a/src/ipa/rkisp1/algorithms/awb.cpp b/src/ipa/rkisp1/algorithms/awb.cpp\nindex 399fb51be414..a664011a9f0d 100644\n--- a/src/ipa/rkisp1/algorithms/awb.cpp\n+++ b/src/ipa/rkisp1/algorithms/awb.cpp\n@@ -91,7 +91,10 @@ int Awb::init(IPAContext &context, const YamlObject &tuningData)\n \t\t\t\t\t\t\t kMaxColourTemperature,\n \t\t\t\t\t\t\t kDefaultColourTemperature);\n \tcmap[&controls::AwbEnable] = ControlInfo(false, true);\n-\tcmap[&controls::ColourGains] = ControlInfo(0.0f, 3.996f, 1.0f);\n+\n+\tstd::array<float, 2> defColourGains = { 1.0f, 1.0f };\n+\tcmap[&controls::ColourGains] = ControlInfo(0.0f, 3.996f,\n+\t\t\t\t\t\t Span<const float, 2>{ defColourGains });\n \n \tif (!tuningData.contains(\"algorithm\"))\n \t\tLOG(RkISP1Awb, Info) << \"No AWB algorithm specified.\"\ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex fa22bfc34904..3f098610a06a 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -436,10 +436,12 @@ void IPARkISP1::updateControls(const IPACameraSensorInfo &sensorInfo,\n \t\tuint64_t frameSize = lineLength * frameHeights[i];\n \t\tframeDurations[i] = frameSize / (sensorInfo.pixelRate / 1000000U);\n \t}\n+\tstd::array<int64_t, 2> defFrameDurations = { frameDurations[2], frameDurations[2] };\n \n \t/* \\todo Move this (and other agc-related controls) to agc */\n \tcontext_.ctrlMap[&controls::FrameDurationLimits] =\n-\t\tControlInfo(frameDurations[0], frameDurations[1], frameDurations[2]);\n+\t\tControlInfo(frameDurations[0], frameDurations[1],\n+\t\t\t ControlValue(Span<const int64_t, 2>{ defFrameDurations }));\n \n \tctrlMap.insert(context_.ctrlMap.begin(), context_.ctrlMap.end());\n \t*ipaControls = ControlInfoMap(std::move(ctrlMap), controls::controls);\ndiff --git a/src/ipa/rpi/common/ipa_base.cpp b/src/ipa/rpi/common/ipa_base.cpp\nindex 8dfe35cc3267..67dab6cd970c 100644\n--- a/src/ipa/rpi/common/ipa_base.cpp\n+++ b/src/ipa/rpi/common/ipa_base.cpp\n@@ -7,6 +7,7 @@\n \n #include \"ipa_base.h\"\n \n+#include <array>\n #include <cmath>\n \n #include <libcamera/base/log.h>\n@@ -243,10 +244,14 @@ int32_t IpaBase::configure(const IPACameraSensorInfo &sensorInfo, const ConfigPa\n \t * based on the current sensor mode.\n \t */\n \tControlInfoMap::Map ctrlMap = ipaControls;\n+\tstd::array<int64_t, 2> defFrameDurations = {\n+\t\tstatic_cast<int64_t>(defaultMinFrameDuration.get<std::micro>()),\n+\t\tstatic_cast<int64_t>(defaultMinFrameDuration.get<std::micro>())\n+\t};\n \tctrlMap[&controls::FrameDurationLimits] =\n \t\tControlInfo(static_cast<int64_t>(mode_.minFrameDuration.get<std::micro>()),\n \t\t\t static_cast<int64_t>(mode_.maxFrameDuration.get<std::micro>()),\n-\t\t\t static_cast<int64_t>(defaultMinFrameDuration.get<std::micro>()));\n+\t\t\t Span<const int64_t, 2>{ defFrameDurations });\n \n \tctrlMap[&controls::AnalogueGain] =\n \t\tControlInfo(static_cast<float>(mode_.minAnalogueGain),\n", "prefixes": [ "v3", "2/2" ] }