{"id":22987,"url":"https://patchwork.libcamera.org/api/1.1/patches/22987/?format=json","web_url":"https://patchwork.libcamera.org/patch/22987/","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":"<20250319161152.63625-10-stefan.klug@ideasonboard.com>","date":"2025-03-19T16:11:14","name":"[v2,09/17] ipa: rkisp1: Refactor automatic/manual structure in IPAActiveState","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"06cee54756e14e3c1fee2950e061a3dd224919c4","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/22987/mbox/","series":[{"id":5071,"url":"https://patchwork.libcamera.org/api/1.1/series/5071/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5071","date":"2025-03-19T16:11:05","name":"Some rkisp1 awb improvements","version":2,"mbox":"https://patchwork.libcamera.org/series/5071/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22987/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22987/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 AC2ECC32FE\n\tfor ;\n\tWed, 19 Mar 2025 16:12:24 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6519968967;\n\tWed, 19 Mar 2025 17:12:24 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6D0BE68962\n\tfor ;\n\tWed, 19 Mar 2025 17:12:23 +0100 (CET)","from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:760:e5ca:4814:99c7])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8758C8FA;\n\tWed, 19 Mar 2025 17:10: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=\"CRU7mRDz\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1742400640;\n\tbh=wLcGUSOBZBOfcfD9gdaPSiufSRlJxTeXCp+gmRkIErE=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=CRU7mRDzqulBnp+sUQzmYVFSGctyvfdIF2YyABitGi8Ic8LSRYqvqA0iGlhnOw2M1\n\tmv9tB6bWMveyLZvbcDUlh3BmDUVYb9hexvLVezPzhS2958wIIzsRcEnLa0sOO7VLhP\n\ttHh7tyntGe/5pUTmD2XA2eX2gInOSC/uQZPrNRdo=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ","Subject":"[PATCH v2 09/17] ipa: rkisp1: Refactor automatic/manual structure in\n\tIPAActiveState","Date":"Wed, 19 Mar 2025 17:11:14 +0100","Message-ID":"<20250319161152.63625-10-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20250319161152.63625-1-stefan.klug@ideasonboard.com>","References":"<20250319161152.63625-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 \n\n---\n\nChanges in v2:\n- Use one named struct instead of two anonymous ones\n---\n src/ipa/rkisp1/algorithms/awb.cpp | 24 ++++++++++++------------\n src/ipa/rkisp1/ipa_context.h | 10 ++++++----\n 2 files changed, 18 insertions(+), 16 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.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":["v2","09/17"]}