{"id":25077,"url":"https://patchwork.libcamera.org/api/patches/25077/?format=json","web_url":"https://patchwork.libcamera.org/patch/25077/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20251117080818.3009835-3-paul.elder@ideasonboard.com>","date":"2025-11-17T08:08:15","name":"[v6,2/2] ipa: ipu3, mali-c55, rkisp1, rpi: Fix reporting non-scalar controls","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"abb08df670abe07cc5c4c101dc8e7a88e19439ae","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/25077/mbox/","series":[{"id":5592,"url":"https://patchwork.libcamera.org/api/series/5592/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5592","date":"2025-11-17T08:08:13","name":"Fix ControlSerializer deserializing array controls","version":6,"mbox":"https://patchwork.libcamera.org/series/5592/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/25077/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/25077/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 2FCCEBD80A\n\tfor ;\n\tMon, 17 Nov 2025 08:08:49 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7865560A8A;\n\tMon, 17 Nov 2025 09:08:47 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 10579606A0\n\tfor ;\n\tMon, 17 Nov 2025 09:08:45 +0100 (CET)","from neptunite.hamster-moth.ts.net (unknown\n\t[IPv6:2404:7a81:160:2100:e0cd:14aa:3681:9fc1])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B4287FE;\n\tMon, 17 Nov 2025 09:06:40 +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=\"Unco73E+\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1763366802;\n\tbh=SuAZT90gXGAqeM+eDrIqrsD8KQTAdFC2T5zm6f2kcgA=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Unco73E+R39sPegcyC7IFLFL85OiYl4JJIx+MQ/FQKWRIgH8ksjgpk7P9WFkgzCdI\n\tRvZhXbw5Gtcoe5xW61/H8DpeJ0BqvkXxu/PW0GI3H7fJE13EoB3y2slNGbPoPWdczd\n\tFGFK3q/6uopUckjYEPnuWGO6NLV+IT7Pwae4DJBc=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Cc":"Paul Elder , =?utf-8?q?Barnab=C3=A1s_P?=\n\t=?utf-8?b?xZFjemU=?= ,\n\tNaushir Patuck ","Subject":"[PATCH v6 2/2] ipa: ipu3, mali-c55, rkisp1,\n\trpi: Fix reporting non-scalar controls","Date":"Mon, 17 Nov 2025 17:08:15 +0900","Message-ID":"<20251117080818.3009835-3-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.47.2","In-Reply-To":"<20251117080818.3009835-1-paul.elder@ideasonboard.com>","References":"<20251117080818.3009835-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","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 non-scalar default values for controls that have a defined\nsize. This is because applications should be able to directly set the\ndefault value from a ControlInfo to the control.\n\nCurrently this is relevant to the following controls:\n- ColourGains\n- ColourCorrectionMatrix\n- FrameDurationLimits\n- AfWindows\n\nFix the scalarness of these controls where relevant.\n\nSigned-off-by: Paul Elder \nTested-by: Barnabás Pőcze # rkisp1\nReviewed-by: Naushir Patuck \n\n---\nNo change in v6\n\nChanges in v5:\n- add AfWindows\n- create Span arrays on-the-fly\n\nChanges in v4:\n- improve commit message\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 | 4 +++-\n src/ipa/rkisp1/algorithms/awb.cpp | 4 +++-\n src/ipa/rkisp1/rkisp1.cpp | 3 ++-\n src/ipa/rpi/common/ipa_base.cpp | 7 +++++--\n 5 files changed, 15 insertions(+), 7 deletions(-)","diff":"diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex 1cae08bf255f..b926f579a9a3 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,9 @@ 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-\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{ { frameDurations[2], frameDurations[2] } });\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..4eaedabb47b8 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@@ -236,7 +238,7 @@ void IPAMaliC55::updateControls(const IPACameraSensorInfo &sensorInfo,\n \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{ { frameDurations[2], frameDurations[2] } });\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..e8da7974a1d6 100644\n--- a/src/ipa/rkisp1/algorithms/awb.cpp\n+++ b/src/ipa/rkisp1/algorithms/awb.cpp\n@@ -91,7 +91,9 @@ 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+\tcmap[&controls::ColourGains] = ControlInfo(0.0f, 3.996f,\n+\t\t\t\t\t\t Span{ { 1.0f, 1.0f } });\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..61d3d1f6f96b 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -439,7 +439,8 @@ void IPARkISP1::updateControls(const IPACameraSensorInfo &sensorInfo,\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{ { frameDurations[2], frameDurations[2] } }));\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..14aba4500ae4 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@@ -105,7 +106,8 @@ const ControlInfoMap::Map ipaAfControls{\n \t{ &controls::AfRange, ControlInfo(controls::AfRangeValues) },\n \t{ &controls::AfSpeed, ControlInfo(controls::AfSpeedValues) },\n \t{ &controls::AfMetering, ControlInfo(controls::AfMeteringValues) },\n-\t{ &controls::AfWindows, ControlInfo(Rectangle{}, Rectangle(65535, 65535, 65535, 65535), Rectangle{}) },\n+\t{ &controls::AfWindows, ControlInfo(Rectangle{}, Rectangle(65535, 65535, 65535, 65535),\n+\t\t\t\t\t Span{ { Rectangle{} } }) },\n \t{ &controls::AfTrigger, ControlInfo(controls::AfTriggerValues) },\n \t{ &controls::AfPause, ControlInfo(controls::AfPauseValues) },\n \t{ &controls::LensPosition, ControlInfo(0.0f, 32.0f, 1.0f) }\n@@ -246,7 +248,8 @@ int32_t IpaBase::configure(const IPACameraSensorInfo &sensorInfo, const ConfigPa\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{ { static_cast(defaultMinFrameDuration.get()),\n+\t\t\t\t\t\t static_cast(defaultMinFrameDuration.get()) } });\n \n \tctrlMap[&controls::AnalogueGain] =\n \t\tControlInfo(static_cast(mode_.minAnalogueGain),\n","prefixes":["v6","2/2"]}