Patch Detail
Show a patch.
GET /api/1.1/patches/25047/?format=api
{ "id": 25047, "url": "https://patchwork.libcamera.org/api/1.1/patches/25047/?format=api", "web_url": "https://patchwork.libcamera.org/patch/25047/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20251114005428.90024-18-kieran.bingham@ideasonboard.com>", "date": "2025-11-14T00:54:21", "name": "[v4,17/21] ipa: mali-c55: Convert AWB to UQ4_8 usage", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "a8906dc8342c42840a62872c2b928e9a233acef7", "submitter": { "id": 4, "url": "https://patchwork.libcamera.org/api/1.1/people/4/?format=api", "name": "Kieran Bingham", "email": "kieran.bingham@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/25047/mbox/", "series": [ { "id": 5589, "url": "https://patchwork.libcamera.org/api/1.1/series/5589/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5589", "date": "2025-11-14T00:54:04", "name": "libipa: Introduce a Quantized type", "version": 4, "mbox": "https://patchwork.libcamera.org/series/5589/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/25047/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/25047/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 D2E6DC3263\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 14 Nov 2025 00:55:10 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7DFB760A81;\n\tFri, 14 Nov 2025 01:55:10 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F388160AB8\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 14 Nov 2025 01:54:53 +0100 (CET)", "from charm.hippo-penny.ts.net\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6ED77201D;\n\tFri, 14 Nov 2025 01:52:53 +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=\"A838l/BU\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1763081573;\n\tbh=pmpqXM/gTIccr4acD4Uf74aey0kdK+gtY1dkgp7O7dk=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=A838l/BUsRjE9Tf7yUa8pdfodfAjguPJPNFb72IdXAiK5UB0RYGTLE6o9boGYpcjr\n\tONFJw2kNcNKxc9CsSKPVmw5TuuIWeGYEHH24/5j89Vb6bgQzFQU4dXPxU7De2+OWAi\n\tTE6amGZFB9A7rYxm6Xg7WQshVVAUVtzC9kyi8nxs=", "From": "Kieran Bingham <kieran.bingham@ideasonboard.com>", "To": "libcamera devel <libcamera-devel@lists.libcamera.org>", "Cc": "Kieran Bingham <kieran.bingham@ideasonboard.com>", "Subject": "[PATCH v4 17/21] ipa: mali-c55: Convert AWB to UQ4_8 usage", "Date": "Fri, 14 Nov 2025 00:54:21 +0000", "Message-ID": "<20251114005428.90024-18-kieran.bingham@ideasonboard.com>", "X-Mailer": "git-send-email 2.51.1", "In-Reply-To": "<20251114005428.90024-1-kieran.bingham@ideasonboard.com>", "References": "<20251114005428.90024-1-kieran.bingham@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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Utilise the new FixedPoint type to explicitly calculate gains for AWB in Q4.8\nformat. This ensures that reporting of gains in metadata reflect the true\nAWB gains applied.\n\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\n src/ipa/mali-c55/algorithms/awb.cpp | 44 ++++++++++++++---------------\n src/ipa/mali-c55/ipa_context.h | 10 ++++---\n 2 files changed, 28 insertions(+), 26 deletions(-)", "diff": "diff --git a/src/ipa/mali-c55/algorithms/awb.cpp b/src/ipa/mali-c55/algorithms/awb.cpp\nindex 3d546e5a854b..6e213f43e762 100644\n--- a/src/ipa/mali-c55/algorithms/awb.cpp\n+++ b/src/ipa/mali-c55/algorithms/awb.cpp\n@@ -37,8 +37,8 @@ int Awb::configure([[maybe_unused]] IPAContext &context,\n \t * for the first frame we will make no assumptions and leave the R/B\n \t * channels unmodified.\n \t */\n-\tcontext.activeState.awb.rGain = 1.0;\n-\tcontext.activeState.awb.bGain = 1.0;\n+\tcontext.activeState.awb.rGain = 1.0f;\n+\tcontext.activeState.awb.bGain = 1.0f;\n \n \treturn 0;\n }\n@@ -50,8 +50,8 @@ size_t Awb::fillGainsParamBlock(mali_c55_params_block block, IPAContext &context\n \tblock.header->flags = MALI_C55_PARAM_BLOCK_FL_NONE;\n \tblock.header->size = sizeof(struct mali_c55_params_awb_gains);\n \n-\tdouble rGain = context.activeState.awb.rGain;\n-\tdouble bGain = context.activeState.awb.bGain;\n+\tUQ4_8 rGain = context.activeState.awb.rGain;\n+\tUQ4_8 bGain = context.activeState.awb.bGain;\n \n \t/*\n \t * The gains here map as follows:\n@@ -63,10 +63,10 @@ size_t Awb::fillGainsParamBlock(mali_c55_params_block block, IPAContext &context\n \t * This holds true regardless of the bayer order of the input data, as\n \t * the mapping is done internally in the ISP.\n \t */\n-\tblock.awb_gains->gain00 = floatingToFixedPoint<4, 8, uint16_t, double>(rGain);\n-\tblock.awb_gains->gain01 = floatingToFixedPoint<4, 8, uint16_t, double>(1.0);\n-\tblock.awb_gains->gain10 = floatingToFixedPoint<4, 8, uint16_t, double>(1.0);\n-\tblock.awb_gains->gain11 = floatingToFixedPoint<4, 8, uint16_t, double>(bGain);\n+\tblock.awb_gains->gain00 = rGain.quantized();\n+\tblock.awb_gains->gain01 = UQ4_8(1.0f).quantized();\n+\tblock.awb_gains->gain10 = UQ4_8(1.0f).quantized();\n+\tblock.awb_gains->gain11 = bGain.quantized();\n \n \tframeContext.awb.rGain = rGain;\n \tframeContext.awb.bGain = bGain;\n@@ -162,8 +162,8 @@ void Awb::process(IPAContext &context, const uint32_t frame,\n \t\t * The statistics are in Q4.8 format, so we convert to double\n \t\t * here.\n \t\t */\n-\t\trgSum += fixedToFloatingPoint<4, 8, double, uint16_t>(awb_ratios[i].avg_rg_gr);\n-\t\tbgSum += fixedToFloatingPoint<4, 8, double, uint16_t>(awb_ratios[i].avg_bg_br);\n+\t\trgSum += UQ4_8(awb_ratios[i].avg_rg_gr).value();\n+\t\tbgSum += UQ4_8(awb_ratios[i].avg_bg_br).value();\n \t\tcounted_zones++;\n \t}\n \n@@ -186,8 +186,8 @@ void Awb::process(IPAContext &context, const uint32_t frame,\n \t * figure by the gains that were applied when the statistics for this\n \t * frame were generated.\n \t */\n-\tdouble rRatio = rgAvg / frameContext.awb.rGain;\n-\tdouble bRatio = bgAvg / frameContext.awb.bGain;\n+\tdouble rRatio = rgAvg / frameContext.awb.rGain.value();\n+\tdouble bRatio = bgAvg / frameContext.awb.bGain.value();\n \n \t/*\n \t * And then we can simply invert the ratio to find the gain we should\n@@ -203,24 +203,24 @@ void Awb::process(IPAContext &context, const uint32_t frame,\n \t * want to fix the miscolouring as quickly as possible.\n \t */\n \tdouble speed = frame < kNumStartupFrames ? 1.0 : 0.2;\n-\trGain = speed * rGain + context.activeState.awb.rGain * (1.0 - speed);\n-\tbGain = speed * bGain + context.activeState.awb.bGain * (1.0 - speed);\n+\trGain = speed * rGain + context.activeState.awb.rGain.value() * (1.0 - speed);\n+\tbGain = speed * bGain + context.activeState.awb.bGain.value() * (1.0 - speed);\n \n-\tcontext.activeState.awb.rGain = rGain;\n-\tcontext.activeState.awb.bGain = bGain;\n+\tcontext.activeState.awb.rGain = static_cast<float>(rGain);\n+\tcontext.activeState.awb.bGain = static_cast<float>(bGain);\n \n \tmetadata.set(controls::ColourGains, {\n-\t\tstatic_cast<float>(frameContext.awb.rGain),\n-\t\tstatic_cast<float>(frameContext.awb.bGain),\n+\t\tframeContext.awb.rGain.value(),\n+\t\tframeContext.awb.bGain.value(),\n \t});\n \n \tLOG(MaliC55Awb, Debug) << \"For frame number \" << frame << \": \"\n \t\t<< \"Average R/G Ratio: \" << rgAvg\n \t\t<< \", Average B/G Ratio: \" << bgAvg\n-\t\t<< \"\\nrGain applied to this frame: \" << frameContext.awb.rGain\n-\t\t<< \", bGain applied to this frame: \" << frameContext.awb.bGain\n-\t\t<< \"\\nrGain to apply: \" << context.activeState.awb.rGain\n-\t\t<< \", bGain to apply: \" << context.activeState.awb.bGain;\n+\t\t<< \"\\nrGain applied to this frame: \" << frameContext.awb.rGain.value()\n+\t\t<< \", bGain applied to this frame: \" << frameContext.awb.bGain.value()\n+\t\t<< \"\\nrGain to apply: \" << context.activeState.awb.rGain.value()\n+\t\t<< \", bGain to apply: \" << context.activeState.awb.bGain.value();\n }\n \n REGISTER_IPA_ALGORITHM(Awb, \"Awb\")\ndiff --git a/src/ipa/mali-c55/ipa_context.h b/src/ipa/mali-c55/ipa_context.h\nindex 13885eb83b5c..86d060a731cb 100644\n--- a/src/ipa/mali-c55/ipa_context.h\n+++ b/src/ipa/mali-c55/ipa_context.h\n@@ -14,6 +14,8 @@\n \n #include <libipa/fc_queue.h>\n \n+#include \"libipa/fixedpoint.h\"\n+\n namespace libcamera {\n \n namespace ipa::mali_c55 {\n@@ -53,8 +55,8 @@ struct IPAActiveState {\n \t} agc;\n \n \tstruct {\n-\t\tdouble rGain;\n-\t\tdouble bGain;\n+\t\tUQ4_8 rGain;\n+\t\tUQ4_8 bGain;\n \t} awb;\n };\n \n@@ -66,8 +68,8 @@ struct IPAFrameContext : public FrameContext {\n \t} agc;\n \n \tstruct {\n-\t\tdouble rGain;\n-\t\tdouble bGain;\n+\t\tUQ4_8 rGain;\n+\t\tUQ4_8 bGain;\n \t} awb;\n };\n \n", "prefixes": [ "v4", "17/21" ] }