{"id":24301,"url":"https://patchwork.libcamera.org/api/1.1/patches/24301/?format=json","web_url":"https://patchwork.libcamera.org/patch/24301/","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":"<20250910093539.3216782-3-paul.elder@ideasonboard.com>","date":"2025-09-10T09:35:19","name":"[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/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/24301/mbox/","series":[{"id":5427,"url":"https://patchwork.libcamera.org/api/1.1/series/5427/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5427","date":"2025-09-10T09:35:17","name":"Fix ControlSerializer deserializing array controls","version":1,"mbox":"https://patchwork.libcamera.org/series/5427/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/24301/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/24301/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 CC46ABDB13\n\tfor ;\n\tWed, 10 Sep 2025 09:35:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 38B7F69373;\n\tWed, 10 Sep 2025 11:35:57 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 107BB6936D\n\tfor ;\n\tWed, 10 Sep 2025 11:35:53 +0200 (CEST)","from neptunite.hamster-moth.ts.net (unknown\n\t[IPv6:2404:7a81:160:2100:e06d:abb0:39cf:8f3a])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 5728A13BE;\n\tWed, 10 Sep 2025 11:34:38 +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=\"iW86BMI7\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1757496879;\n\tbh=I8w60WaPrlPNbQXQzr32O6HN3oKRmGIoRX/bP5evqqg=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=iW86BMI7uCs+l4QCiJ5JMy86kDVf85u3SGwSpkWvQs5O7clec/p/rF7b6tffEibQv\n\tENdAJcgNY6UEpiBrwg4Qh6lEfsuoKJZuc2O42MKN/Q/SqYfTEL6/DCRQaetp0u2tn+\n\tezBaCiOePbvBxYCLIjYe8fD0v0rdeYgRRHe25TgU=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Cc":"Paul Elder ","Subject":"[PATCH 2/2] ipa: ipu3, mali-c55, rkisp1,\n\trpi: Fix reporting non-scalar controls","Date":"Wed, 10 Sep 2025 18:35:19 +0900","Message-ID":"<20250910093539.3216782-3-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.47.2","In-Reply-To":"<20250910093539.3216782-1-paul.elder@ideasonboard.com>","References":"<20250910093539.3216782-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":"","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 ControlInfos of non-scalar controls that are reported in controls()\nmust have scalar min/max and non-scalar default values for controls that\nhave a defined size. Currently this is relevant to the following\ncontrols:\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 \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 \n #include \n+#include \n #include \n \n #include \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 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{ 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 \n #include \n #include \n #include \n@@ -14,6 +15,7 @@\n \n #include \n #include \n+#include \n \n #include \n #include \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 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{ 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 defColourGains = { 1.0f, 1.0f };\n+\tcmap[&controls::ColourGains] = ControlInfo(0.0f, 3.996f,\n+\t\t\t\t\t\t Span{ 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 cf66d5553dcd..6eb3ae9c6310 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -430,10 +430,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 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{ 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 6448e6abd735..e34e890f0bdc 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 \n #include \n \n #include \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 defFrameDurations = {\n+\t\tstatic_cast(defaultMinFrameDuration.get()),\n+\t\tstatic_cast(defaultMinFrameDuration.get())\n+\t};\n \tctrlMap[&controls::FrameDurationLimits] =\n \t\tControlInfo(static_cast(mode_.minFrameDuration.get()),\n \t\t\t static_cast(mode_.maxFrameDuration.get()),\n-\t\t\t static_cast(defaultMinFrameDuration.get()));\n+\t\t\t Span{ defFrameDurations });\n \n \tctrlMap[&controls::AnalogueGain] =\n \t\tControlInfo(static_cast(mode_.minAnalogueGain),\n","prefixes":["2/2"]}