{"id":23125,"url":"https://patchwork.libcamera.org/api/1.1/patches/23125/?format=json","web_url":"https://patchwork.libcamera.org/patch/23125/","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":"<20250403154925.382973-10-stefan.klug@ideasonboard.com>","date":"2025-04-03T15:49:14","name":"[v3,09/16] ipa: rkisp1: Refactor automatic/manual structure in IPAActiveState","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"510fed7cfad87594e8a8b2ed90bf8285a63d15b9","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/1.1/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/23125/mbox/","series":[{"id":5111,"url":"https://patchwork.libcamera.org/api/1.1/series/5111/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5111","date":"2025-04-03T15:49:05","name":"Some rkisp1 awb improvements","version":3,"mbox":"https://patchwork.libcamera.org/series/5111/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/23125/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/23125/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 72149C327D\n\tfor ;\n\tThu, 3 Apr 2025 15:50:04 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2EA1268A9F;\n\tThu, 3 Apr 2025 17:50:04 +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 669B568A54\n\tfor ;\n\tThu, 3 Apr 2025 17:50:02 +0200 (CEST)","from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:6d9d:9854:3fc1:4bb2])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A635E8FA;\n\tThu, 3 Apr 2025 17:48:08 +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=\"SAD2XuI5\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1743695288;\n\tbh=Saqcg+2LVaEKh27fsCjH5nbdr8FI9+BjiGwzGC1Veag=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=SAD2XuI5x7eBoJCIz9z7GDp9/Po60q4LAvuhv12hCbURdANHEYsI/5ji1/EAaq11j\n\tnWgQpyoIEwBDvc3U6EtmbkvTlMOeVUTG1+Ui50lTdJPRoaUDZ29rZFKR3DKSWbas/e\n\tQPrlR6Hff3+6oHVM1frs4pd5CfSKrfc4F2mFOapE=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ,\n\tKieran Bingham ,\n\tLaurent Pinchart ","Subject":"[PATCH v3 09/16] ipa: rkisp1: Refactor automatic/manual structure in\n\tIPAActiveState","Date":"Thu, 3 Apr 2025 17:49:14 +0200","Message-ID":"<20250403154925.382973-10-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20250403154925.382973-1-stefan.klug@ideasonboard.com>","References":"<20250403154925.382973-1-stefan.klug@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":"Swap gains and automatic/manual in the IPAActiveState structure. This is\nin preparation to adding another member, which is easier in the new\nstructure. The patch contains no functional changes.\n\nSigned-off-by: Stefan Klug \nReviewed-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \n\n---\n\nChanges in v2:\n- Use one named struct instead of two anonymous ones\n\nChanges in v3:\n- Collected tags\n- Updated documentation\n---\n src/ipa/rkisp1/algorithms/awb.cpp | 24 ++++++++++++------------\n src/ipa/rkisp1/ipa_context.cpp | 13 ++++++++-----\n src/ipa/rkisp1/ipa_context.h | 10 ++++++----\n 3 files changed, 26 insertions(+), 21 deletions(-)","diff":"diff --git a/src/ipa/rkisp1/algorithms/awb.cpp b/src/ipa/rkisp1/algorithms/awb.cpp\nindex eafe93081bb1..a9759e53f593 100644\n--- a/src/ipa/rkisp1/algorithms/awb.cpp\n+++ b/src/ipa/rkisp1/algorithms/awb.cpp\n@@ -124,8 +124,8 @@ int Awb::init(IPAContext &context, const YamlObject &tuningData)\n int Awb::configure(IPAContext &context,\n \t\t const IPACameraSensorInfo &configInfo)\n {\n-\tcontext.activeState.awb.gains.manual = RGB{ 1.0 };\n-\tcontext.activeState.awb.gains.automatic =\n+\tcontext.activeState.awb.manual.gains = RGB{ 1.0 };\n+\tcontext.activeState.awb.automatic.gains =\n \t\tawbAlgo_->gainsFromColourTemperature(kDefaultColourTemperature);\n \tcontext.activeState.awb.autoEnabled = true;\n \tcontext.activeState.awb.temperatureK = kDefaultColourTemperature;\n@@ -173,8 +173,8 @@ void Awb::queueRequest(IPAContext &context,\n \tconst auto &colourTemperature = controls.get(controls::ColourTemperature);\n \tbool update = false;\n \tif (colourGains) {\n-\t\tawb.gains.manual.r() = (*colourGains)[0];\n-\t\tawb.gains.manual.b() = (*colourGains)[1];\n+\t\tawb.manual.gains.r() = (*colourGains)[0];\n+\t\tawb.manual.gains.b() = (*colourGains)[1];\n \t\t/*\n \t\t * \\todo Colour temperature reported in metadata is now\n \t\t * incorrect, as we can't deduce the temperature from the gains.\n@@ -183,17 +183,17 @@ void Awb::queueRequest(IPAContext &context,\n \t\tupdate = true;\n \t} else if (colourTemperature) {\n \t\tconst auto &gains = awbAlgo_->gainsFromColourTemperature(*colourTemperature);\n-\t\tawb.gains.manual.r() = gains.r();\n-\t\tawb.gains.manual.b() = gains.b();\n+\t\tawb.manual.gains.r() = gains.r();\n+\t\tawb.manual.gains.b() = gains.b();\n \t\tawb.temperatureK = *colourTemperature;\n \t\tupdate = true;\n \t}\n \n \tif (update)\n \t\tLOG(RkISP1Awb, Debug)\n-\t\t\t<< \"Set colour gains to \" << awb.gains.manual;\n+\t\t\t<< \"Set colour gains to \" << awb.manual.gains;\n \n-\tframeContext.awb.gains = awb.gains.manual;\n+\tframeContext.awb.gains = awb.manual.gains;\n \tframeContext.awb.temperatureK = awb.temperatureK;\n }\n \n@@ -208,7 +208,7 @@ void Awb::prepare(IPAContext &context, const uint32_t frame,\n \t * most up-to-date automatic values we can read.\n \t */\n \tif (frameContext.awb.autoEnabled) {\n-\t\tframeContext.awb.gains = context.activeState.awb.gains.automatic;\n+\t\tframeContext.awb.gains = context.activeState.awb.automatic.gains;\n \t\tframeContext.awb.temperatureK = context.activeState.awb.temperatureK;\n \t}\n \n@@ -325,14 +325,14 @@ void Awb::process(IPAContext &context,\n \t/* Filter the values to avoid oscillations. */\n \tdouble speed = 0.2;\n \tawbResult.gains = awbResult.gains * speed +\n-\t\t\t activeState.awb.gains.automatic * (1 - speed);\n+\t\t\t activeState.awb.automatic.gains * (1 - speed);\n \n-\tactiveState.awb.gains.automatic = awbResult.gains;\n+\tactiveState.awb.automatic.gains = awbResult.gains;\n \n \tLOG(RkISP1Awb, Debug)\n \t\t<< std::showpoint\n \t\t<< \"Means \" << rgbMeans << \", gains \"\n-\t\t<< activeState.awb.gains.automatic << \", temp \"\n+\t\t<< activeState.awb.automatic.gains << \", temp \"\n \t\t<< activeState.awb.temperatureK << \"K\";\n }\n \ndiff --git a/src/ipa/rkisp1/ipa_context.cpp b/src/ipa/rkisp1/ipa_context.cpp\nindex 99611bd5b390..39b97d143e95 100644\n--- a/src/ipa/rkisp1/ipa_context.cpp\n+++ b/src/ipa/rkisp1/ipa_context.cpp\n@@ -191,14 +191,17 @@ namespace libcamera::ipa::rkisp1 {\n * \\var IPAActiveState::awb\n * \\brief State for the Automatic White Balance algorithm\n *\n- * \\struct IPAActiveState::awb.gains\n+ * \\var IPAActiveState::awb::AwbState\n+ * \\brief Struct for the AWB regulation state\n+ *\n+ * \\struct IPAActiveState::awb::AwbState.gains\n * \\brief White balance gains\n *\n- * \\var IPAActiveState::awb.gains.manual\n- * \\brief Manual white balance gains (set through requests)\n+ * \\var IPAActiveState::awb.manual\n+ * \\brief Manual regulation state (set through requests)\n *\n- * \\var IPAActiveState::awb.gains.automatic\n- * \\brief Automatic white balance gains (computed by the algorithm)\n+ * \\var IPAActiveState::awb.automatic\n+ * \\brief Automatic regulation state (computed by the algorithm)\n *\n * \\var IPAActiveState::awb.temperatureK\n * \\brief Estimated color temperature\ndiff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h\nindex 474f7036f003..6bc922a82971 100644\n--- a/src/ipa/rkisp1/ipa_context.h\n+++ b/src/ipa/rkisp1/ipa_context.h\n@@ -89,10 +89,12 @@ struct IPAActiveState {\n \t} agc;\n \n \tstruct {\n-\t\tstruct {\n-\t\t\tRGB manual;\n-\t\t\tRGB automatic;\n-\t\t} gains;\n+\t\tstruct AwbState {\n+\t\t\tRGB gains;\n+\t\t};\n+\n+\t\tAwbState manual;\n+\t\tAwbState automatic;\n \n \t\tunsigned int temperatureK;\n \t\tbool autoEnabled;\n","prefixes":["v3","09/16"]}