{"id":22013,"url":"https://patchwork.libcamera.org/api/1.1/patches/22013/?format=json","web_url":"https://patchwork.libcamera.org/patch/22013/","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":"<20241119121928.30939-16-laurent.pinchart@ideasonboard.com>","date":"2024-11-19T12:19:26","name":"[v4,15/17] ipa: rkisp1: awb: Use RGB class to store colour gains","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"c372820e666e0cd947235806fe2cb126cfbcf94a","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22013/mbox/","series":[{"id":4804,"url":"https://patchwork.libcamera.org/api/1.1/series/4804/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4804","date":"2024-11-19T12:19:11","name":"Improve linear algebra helpers in libipa","version":4,"mbox":"https://patchwork.libcamera.org/series/4804/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22013/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22013/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 713ADC32F3\n\tfor ;\n\tTue, 19 Nov 2024 12:20:31 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E716C65F41;\n\tTue, 19 Nov 2024 13:20:30 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6F6C565F3B\n\tfor ;\n\tTue, 19 Nov 2024 13:20:25 +0100 (CET)","from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 9BFDA1A4A\n\tfor ;\n\tTue, 19 Nov 2024 13:20:07 +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=\"P0xw3/Bi\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1732018807;\n\tbh=2BLsRqZ0wvApEx6CVUwoEr7WazrYFC9FciaQ6viBWg8=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=P0xw3/BixQvERK62GTPk5j3HYAYJxKhg8K2qX5mCa0c6B8SOVfR7PeHZyodOA24+Y\n\tc0lPQokYJg8pfby6aPvI39fEzite+8E8LO5mvm2m2W/RC9ZsZUENYj3kqwGGxSiiGJ\n\tzz34cv4IWCsIDjLX/94dMFQWfRVcUHQpmzFZIWE4=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH v4 15/17] ipa: rkisp1: awb: Use RGB class to store colour\n\tgains","Date":"Tue, 19 Nov 2024 14:19:26 +0200","Message-ID":"<20241119121928.30939-16-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.45.2","In-Reply-To":"<20241119121928.30939-1-laurent.pinchart@ideasonboard.com>","References":"<20241119121928.30939-1-laurent.pinchart@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":"Replace the manual storage of gains in the IPA active state and frame\ncontext with usage of the RGB class. This simplifies the code thanks to\nusage of the arithmetic functions provided by the RGB class.\n\nSigned-off-by: Laurent Pinchart \nReviewed-by: Milan Zamazal \n---\n src/ipa/rkisp1/algorithms/awb.cpp | 71 +++++++++++--------------------\n src/ipa/rkisp1/ipa_context.cpp | 31 +-------------\n src/ipa/rkisp1/ipa_context.h | 20 ++-------\n 3 files changed, 32 insertions(+), 90 deletions(-)","diff":"diff --git a/src/ipa/rkisp1/algorithms/awb.cpp b/src/ipa/rkisp1/algorithms/awb.cpp\nindex dbeaf81565ff..c330feff9f5d 100644\n--- a/src/ipa/rkisp1/algorithms/awb.cpp\n+++ b/src/ipa/rkisp1/algorithms/awb.cpp\n@@ -47,12 +47,8 @@ Awb::Awb()\n int Awb::configure(IPAContext &context,\n \t\t const IPACameraSensorInfo &configInfo)\n {\n-\tcontext.activeState.awb.gains.manual.red = 1.0;\n-\tcontext.activeState.awb.gains.manual.blue = 1.0;\n-\tcontext.activeState.awb.gains.manual.green = 1.0;\n-\tcontext.activeState.awb.gains.automatic.red = 1.0;\n-\tcontext.activeState.awb.gains.automatic.blue = 1.0;\n-\tcontext.activeState.awb.gains.automatic.green = 1.0;\n+\tcontext.activeState.awb.gains.manual = RGB{ 1.0 };\n+\tcontext.activeState.awb.gains.automatic = RGB{ 1.0 };\n \tcontext.activeState.awb.autoEnabled = true;\n \n \t/*\n@@ -89,21 +85,17 @@ void Awb::queueRequest(IPAContext &context,\n \n \tconst auto &colourGains = controls.get(controls::ColourGains);\n \tif (colourGains && !awb.autoEnabled) {\n-\t\tawb.gains.manual.red = (*colourGains)[0];\n-\t\tawb.gains.manual.blue = (*colourGains)[1];\n+\t\tawb.gains.manual.r() = (*colourGains)[0];\n+\t\tawb.gains.manual.b() = (*colourGains)[1];\n \n \t\tLOG(RkISP1Awb, Debug)\n-\t\t\t<< \"Set colour gains to red: \" << awb.gains.manual.red\n-\t\t\t<< \", blue: \" << awb.gains.manual.blue;\n+\t\t\t<< \"Set colour gains to \" << awb.gains.manual;\n \t}\n \n \tframeContext.awb.autoEnabled = awb.autoEnabled;\n \n-\tif (!awb.autoEnabled) {\n-\t\tframeContext.awb.gains.red = awb.gains.manual.red;\n-\t\tframeContext.awb.gains.green = 1.0;\n-\t\tframeContext.awb.gains.blue = awb.gains.manual.blue;\n-\t}\n+\tif (!awb.autoEnabled)\n+\t\tframeContext.awb.gains = awb.gains.manual;\n }\n \n /**\n@@ -116,19 +108,16 @@ void Awb::prepare(IPAContext &context, const uint32_t frame,\n \t * This is the latest time we can read the active state. This is the\n \t * most up-to-date automatic values we can read.\n \t */\n-\tif (frameContext.awb.autoEnabled) {\n-\t\tframeContext.awb.gains.red = context.activeState.awb.gains.automatic.red;\n-\t\tframeContext.awb.gains.green = context.activeState.awb.gains.automatic.green;\n-\t\tframeContext.awb.gains.blue = context.activeState.awb.gains.automatic.blue;\n-\t}\n+\tif (frameContext.awb.autoEnabled)\n+\t\tframeContext.awb.gains = context.activeState.awb.gains.automatic;\n \n \tauto gainConfig = params->block();\n \tgainConfig.setEnabled(true);\n \n-\tgainConfig->gain_green_b = std::clamp(256 * frameContext.awb.gains.green, 0, 0x3ff);\n-\tgainConfig->gain_blue = std::clamp(256 * frameContext.awb.gains.blue, 0, 0x3ff);\n-\tgainConfig->gain_red = std::clamp(256 * frameContext.awb.gains.red, 0, 0x3ff);\n-\tgainConfig->gain_green_r = std::clamp(256 * frameContext.awb.gains.green, 0, 0x3ff);\n+\tgainConfig->gain_green_b = std::clamp(256 * frameContext.awb.gains.g(), 0, 0x3ff);\n+\tgainConfig->gain_blue = std::clamp(256 * frameContext.awb.gains.b(), 0, 0x3ff);\n+\tgainConfig->gain_red = std::clamp(256 * frameContext.awb.gains.r(), 0, 0x3ff);\n+\tgainConfig->gain_green_r = std::clamp(256 * frameContext.awb.gains.g(), 0, 0x3ff);\n \n \t/* If we have already set the AWB measurement parameters, return. */\n \tif (frame > 0)\n@@ -196,8 +185,8 @@ void Awb::process(IPAContext &context,\n \n \tmetadata.set(controls::AwbEnable, frameContext.awb.autoEnabled);\n \tmetadata.set(controls::ColourGains, {\n-\t\t\tstatic_cast(frameContext.awb.gains.red),\n-\t\t\tstatic_cast(frameContext.awb.gains.blue)\n+\t\t\tstatic_cast(frameContext.awb.gains.r()),\n+\t\t\tstatic_cast(frameContext.awb.gains.b())\n \t\t});\n \tmetadata.set(controls::ColourTemperature, activeState.awb.temperatureK);\n \n@@ -253,12 +242,7 @@ void Awb::process(IPAContext &context,\n \t * divide by the gains that were used to get the raw means from the\n \t * sensor.\n \t */\n-\tRGB gains{{\n-\t\tframeContext.awb.gains.red,\n-\t\tframeContext.awb.gains.green,\n-\t\tframeContext.awb.gains.blue\n-\t}};\n-\trgbMeans /= gains;\n+\trgbMeans /= frameContext.awb.gains;\n \n \t/*\n \t * If the means are too small we don't have enough information to\n@@ -278,8 +262,11 @@ void Awb::process(IPAContext &context,\n \t * gain is hardcoded to 1.0. Avoid divisions by zero by clamping the\n \t * divisor to a minimum value of 1.0.\n \t */\n-\tdouble redGain = rgbMeans.g() / std::max(rgbMeans.r(), 1.0);\n-\tdouble blueGain = rgbMeans.g() / std::max(rgbMeans.b(), 1.0);\n+\tRGB gains({\n+\t\trgbMeans.g() / std::max(rgbMeans.r(), 1.0),\n+\t\t1.0,\n+\t\trgbMeans.g() / std::max(rgbMeans.b(), 1.0)\n+\t});\n \n \t/*\n \t * Clamp the gain values to the hardware, which expresses gains as Q2.8\n@@ -287,24 +274,18 @@ void Awb::process(IPAContext &context,\n \t * divisions by zero when computing the raw means in subsequent\n \t * iterations.\n \t */\n-\tredGain = std::clamp(redGain, 1.0 / 256, 1023.0 / 256);\n-\tblueGain = std::clamp(blueGain, 1.0 / 256, 1023.0 / 256);\n+\tgains = gains.max(1.0 / 256).min(1023.0 / 256);\n \n \t/* Filter the values to avoid oscillations. */\n \tdouble speed = 0.2;\n-\tredGain = speed * redGain + (1 - speed) * activeState.awb.gains.automatic.red;\n-\tblueGain = speed * blueGain + (1 - speed) * activeState.awb.gains.automatic.blue;\n+\tgains = gains * speed + activeState.awb.gains.automatic * (1 - speed);\n \n-\tactiveState.awb.gains.automatic.red = redGain;\n-\tactiveState.awb.gains.automatic.blue = blueGain;\n-\tactiveState.awb.gains.automatic.green = 1.0;\n+\tactiveState.awb.gains.automatic = gains;\n \n \tLOG(RkISP1Awb, Debug)\n \t\t<< std::showpoint\n-\t\t<< \"Means \" << rgbMeans\n-\t\t<< \", gains [\" << activeState.awb.gains.automatic.red << \", \"\n-\t\t<< activeState.awb.gains.automatic.green << \", \"\n-\t\t<< activeState.awb.gains.automatic.blue << \"], temp \"\n+\t\t<< \"Means \" << rgbMeans << \", gains \"\n+\t\t<< activeState.awb.gains.automatic << \", 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 14d0c02a2b32..8f545cd76d52 100644\n--- a/src/ipa/rkisp1/ipa_context.cpp\n+++ b/src/ipa/rkisp1/ipa_context.cpp\n@@ -188,30 +188,12 @@ namespace libcamera::ipa::rkisp1 {\n * \\struct IPAActiveState::awb.gains\n * \\brief White balance gains\n *\n- * \\struct IPAActiveState::awb.gains.manual\n+ * \\var IPAActiveState::awb.gains.manual\n * \\brief Manual white balance gains (set through requests)\n *\n- * \\var IPAActiveState::awb.gains.manual.red\n- * \\brief Manual white balance gain for R channel\n- *\n- * \\var IPAActiveState::awb.gains.manual.green\n- * \\brief Manual white balance gain for G channel\n- *\n- * \\var IPAActiveState::awb.gains.manual.blue\n- * \\brief Manual white balance gain for B channel\n- *\n- * \\struct IPAActiveState::awb.gains.automatic\n+ * \\var IPAActiveState::awb.gains.automatic\n * \\brief Automatic white balance gains (computed by the algorithm)\n *\n- * \\var IPAActiveState::awb.gains.automatic.red\n- * \\brief Automatic white balance gain for R channel\n- *\n- * \\var IPAActiveState::awb.gains.automatic.green\n- * \\brief Automatic white balance gain for G channel\n- *\n- * \\var IPAActiveState::awb.gains.automatic.blue\n- * \\brief Automatic white balance gain for B channel\n- *\n * \\var IPAActiveState::awb.temperatureK\n * \\brief Estimated color temperature\n *\n@@ -333,15 +315,6 @@ namespace libcamera::ipa::rkisp1 {\n * \\struct IPAFrameContext::awb.gains\n * \\brief White balance gains\n *\n- * \\var IPAFrameContext::awb.gains.red\n- * \\brief White balance gain for R channel\n- *\n- * \\var IPAFrameContext::awb.gains.green\n- * \\brief White balance gain for G channel\n- *\n- * \\var IPAFrameContext::awb.gains.blue\n- * \\brief White balance gain for B channel\n- *\n * \\var IPAFrameContext::awb.temperatureK\n * \\brief Estimated color temperature\n *\ndiff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h\nindex 7b93a9e9461d..b4dec0c3288d 100644\n--- a/src/ipa/rkisp1/ipa_context.h\n+++ b/src/ipa/rkisp1/ipa_context.h\n@@ -25,6 +25,7 @@\n #include \n #include \n #include \n+#include \n \n namespace libcamera {\n \n@@ -87,16 +88,8 @@ struct IPAActiveState {\n \n \tstruct {\n \t\tstruct {\n-\t\t\tstruct {\n-\t\t\t\tdouble red;\n-\t\t\t\tdouble green;\n-\t\t\t\tdouble blue;\n-\t\t\t} manual;\n-\t\t\tstruct {\n-\t\t\t\tdouble red;\n-\t\t\t\tdouble green;\n-\t\t\t\tdouble blue;\n-\t\t\t} automatic;\n+\t\t\tRGB manual;\n+\t\t\tRGB automatic;\n \t\t} gains;\n \n \t\tunsigned int temperatureK;\n@@ -140,12 +133,7 @@ struct IPAFrameContext : public FrameContext {\n \t} agc;\n \n \tstruct {\n-\t\tstruct {\n-\t\t\tdouble red;\n-\t\t\tdouble green;\n-\t\t\tdouble blue;\n-\t\t} gains;\n-\n+\t\tRGB gains;\n \t\tbool autoEnabled;\n \t} awb;\n \n","prefixes":["v4","15/17"]}