From patchwork Fri Nov 14 00:54:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 25047 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id D2E6DC3263 for ; Fri, 14 Nov 2025 00:55:10 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7DFB760A81; Fri, 14 Nov 2025 01:55:10 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="A838l/BU"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id F388160AB8 for ; Fri, 14 Nov 2025 01:54:53 +0100 (CET) Received: from charm.hippo-penny.ts.net (cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6ED77201D; Fri, 14 Nov 2025 01:52:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1763081573; bh=pmpqXM/gTIccr4acD4Uf74aey0kdK+gtY1dkgp7O7dk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A838l/BUsRjE9Tf7yUa8pdfodfAjguPJPNFb72IdXAiK5UB0RYGTLE6o9boGYpcjr ONFJw2kNcNKxc9CsSKPVmw5TuuIWeGYEHH24/5j89Vb6bgQzFQU4dXPxU7De2+OWAi TE6amGZFB9A7rYxm6Xg7WQshVVAUVtzC9kyi8nxs= From: Kieran Bingham To: libcamera devel Cc: Kieran Bingham 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 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Utilise the new FixedPoint type to explicitly calculate gains for AWB in Q4.8 format. This ensures that reporting of gains in metadata reflect the true AWB gains applied. Signed-off-by: Kieran Bingham --- src/ipa/mali-c55/algorithms/awb.cpp | 44 ++++++++++++++--------------- src/ipa/mali-c55/ipa_context.h | 10 ++++--- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/ipa/mali-c55/algorithms/awb.cpp b/src/ipa/mali-c55/algorithms/awb.cpp index 3d546e5a854b..6e213f43e762 100644 --- a/src/ipa/mali-c55/algorithms/awb.cpp +++ b/src/ipa/mali-c55/algorithms/awb.cpp @@ -37,8 +37,8 @@ int Awb::configure([[maybe_unused]] IPAContext &context, * for the first frame we will make no assumptions and leave the R/B * channels unmodified. */ - context.activeState.awb.rGain = 1.0; - context.activeState.awb.bGain = 1.0; + context.activeState.awb.rGain = 1.0f; + context.activeState.awb.bGain = 1.0f; return 0; } @@ -50,8 +50,8 @@ size_t Awb::fillGainsParamBlock(mali_c55_params_block block, IPAContext &context block.header->flags = MALI_C55_PARAM_BLOCK_FL_NONE; block.header->size = sizeof(struct mali_c55_params_awb_gains); - double rGain = context.activeState.awb.rGain; - double bGain = context.activeState.awb.bGain; + UQ4_8 rGain = context.activeState.awb.rGain; + UQ4_8 bGain = context.activeState.awb.bGain; /* * The gains here map as follows: @@ -63,10 +63,10 @@ size_t Awb::fillGainsParamBlock(mali_c55_params_block block, IPAContext &context * This holds true regardless of the bayer order of the input data, as * the mapping is done internally in the ISP. */ - block.awb_gains->gain00 = floatingToFixedPoint<4, 8, uint16_t, double>(rGain); - block.awb_gains->gain01 = floatingToFixedPoint<4, 8, uint16_t, double>(1.0); - block.awb_gains->gain10 = floatingToFixedPoint<4, 8, uint16_t, double>(1.0); - block.awb_gains->gain11 = floatingToFixedPoint<4, 8, uint16_t, double>(bGain); + block.awb_gains->gain00 = rGain.quantized(); + block.awb_gains->gain01 = UQ4_8(1.0f).quantized(); + block.awb_gains->gain10 = UQ4_8(1.0f).quantized(); + block.awb_gains->gain11 = bGain.quantized(); frameContext.awb.rGain = rGain; frameContext.awb.bGain = bGain; @@ -162,8 +162,8 @@ void Awb::process(IPAContext &context, const uint32_t frame, * The statistics are in Q4.8 format, so we convert to double * here. */ - rgSum += fixedToFloatingPoint<4, 8, double, uint16_t>(awb_ratios[i].avg_rg_gr); - bgSum += fixedToFloatingPoint<4, 8, double, uint16_t>(awb_ratios[i].avg_bg_br); + rgSum += UQ4_8(awb_ratios[i].avg_rg_gr).value(); + bgSum += UQ4_8(awb_ratios[i].avg_bg_br).value(); counted_zones++; } @@ -186,8 +186,8 @@ void Awb::process(IPAContext &context, const uint32_t frame, * figure by the gains that were applied when the statistics for this * frame were generated. */ - double rRatio = rgAvg / frameContext.awb.rGain; - double bRatio = bgAvg / frameContext.awb.bGain; + double rRatio = rgAvg / frameContext.awb.rGain.value(); + double bRatio = bgAvg / frameContext.awb.bGain.value(); /* * And then we can simply invert the ratio to find the gain we should @@ -203,24 +203,24 @@ void Awb::process(IPAContext &context, const uint32_t frame, * want to fix the miscolouring as quickly as possible. */ double speed = frame < kNumStartupFrames ? 1.0 : 0.2; - rGain = speed * rGain + context.activeState.awb.rGain * (1.0 - speed); - bGain = speed * bGain + context.activeState.awb.bGain * (1.0 - speed); + rGain = speed * rGain + context.activeState.awb.rGain.value() * (1.0 - speed); + bGain = speed * bGain + context.activeState.awb.bGain.value() * (1.0 - speed); - context.activeState.awb.rGain = rGain; - context.activeState.awb.bGain = bGain; + context.activeState.awb.rGain = static_cast(rGain); + context.activeState.awb.bGain = static_cast(bGain); metadata.set(controls::ColourGains, { - static_cast(frameContext.awb.rGain), - static_cast(frameContext.awb.bGain), + frameContext.awb.rGain.value(), + frameContext.awb.bGain.value(), }); LOG(MaliC55Awb, Debug) << "For frame number " << frame << ": " << "Average R/G Ratio: " << rgAvg << ", Average B/G Ratio: " << bgAvg - << "\nrGain applied to this frame: " << frameContext.awb.rGain - << ", bGain applied to this frame: " << frameContext.awb.bGain - << "\nrGain to apply: " << context.activeState.awb.rGain - << ", bGain to apply: " << context.activeState.awb.bGain; + << "\nrGain applied to this frame: " << frameContext.awb.rGain.value() + << ", bGain applied to this frame: " << frameContext.awb.bGain.value() + << "\nrGain to apply: " << context.activeState.awb.rGain.value() + << ", bGain to apply: " << context.activeState.awb.bGain.value(); } REGISTER_IPA_ALGORITHM(Awb, "Awb") diff --git a/src/ipa/mali-c55/ipa_context.h b/src/ipa/mali-c55/ipa_context.h index 13885eb83b5c..86d060a731cb 100644 --- a/src/ipa/mali-c55/ipa_context.h +++ b/src/ipa/mali-c55/ipa_context.h @@ -14,6 +14,8 @@ #include +#include "libipa/fixedpoint.h" + namespace libcamera { namespace ipa::mali_c55 { @@ -53,8 +55,8 @@ struct IPAActiveState { } agc; struct { - double rGain; - double bGain; + UQ4_8 rGain; + UQ4_8 bGain; } awb; }; @@ -66,8 +68,8 @@ struct IPAFrameContext : public FrameContext { } agc; struct { - double rGain; - double bGain; + UQ4_8 rGain; + UQ4_8 bGain; } awb; };