From patchwork Mon Feb 2 19:25:03 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 26076 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 6E463BD78E for ; Mon, 2 Feb 2026 19:25:13 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 366E461FF6; Mon, 2 Feb 2026 20:25:11 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="fQxPlcbM"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CD2CD61FEE for ; Mon, 2 Feb 2026 20:25:07 +0100 (CET) Received: from [192.168.0.240] (cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id D28FBBE1; Mon, 2 Feb 2026 20:24:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1770060266; bh=5yg6SB2J6IRe2Vhr91jYfy1OWFCuQjSIhRV5HYaJ8Lg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=fQxPlcbMlx5VutmiC9tHOSa7Hx3SkBMSZYTV0NsKY5dT3hZSJuXqscwPOu4AFpRry G41x6PdZkndQqm4/CDu6U1s21I6tXUM9msGvYnaGi2kzwvB1De+ixKySGsxB3we0fF rwWbL51m0Tq1k/rrX5Fq5FB6ZNPfc0JtYnbT7Qes= From: Kieran Bingham Date: Mon, 02 Feb 2026 19:25:03 +0000 Subject: [PATCH 1/3] ipa: rkisp1: Fix awb algorithm brief MIME-Version: 1.0 Message-Id: <20260202-kbingham-fixups-v1-1-7d7dd4b2a27b@ideasonboard.com> References: <20260202-kbingham-fixups-v1-0-7d7dd4b2a27b@ideasonboard.com> In-Reply-To: <20260202-kbingham-fixups-v1-0-7d7dd4b2a27b@ideasonboard.com> To: libcamera-devel@lists.libcamera.org Cc: Kieran Bingham X-Mailer: b4 0.14.2 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" The Awb brief was not updated from when the Bayes AWB was added. Extend it to account for this. Signed-off-by: Kieran Bingham --- src/ipa/rkisp1/algorithms/awb.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ipa/rkisp1/algorithms/awb.cpp b/src/ipa/rkisp1/algorithms/awb.cpp index e8da7974a1d6ad9ec2e22c6b013aead0a88ee1c3..452ee878f4b3dac99586556e2c3ac7c73cada2b3 100644 --- a/src/ipa/rkisp1/algorithms/awb.cpp +++ b/src/ipa/rkisp1/algorithms/awb.cpp @@ -30,7 +30,7 @@ namespace ipa::rkisp1::algorithms { /** * \class Awb - * \brief A Grey world white balance correction algorithm + * \brief Process the RKISP1 AWB statistics for AwbGrey and AwbBayes */ LOG_DEFINE_CATEGORY(RkISP1Awb) From patchwork Mon Feb 2 19:25:04 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 26077 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 57DC0C328F for ; Mon, 2 Feb 2026 19:25:14 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C239462000; Mon, 2 Feb 2026 20:25:11 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="vpLS7BFn"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E1E7661FF1 for ; Mon, 2 Feb 2026 20:25:07 +0100 (CET) Received: from [192.168.0.240] (cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 141AAC59; Mon, 2 Feb 2026 20:24:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1770060267; bh=hwq5lbvYnZaQEFDjhjJkryxq8zCDzxrMsrzRIAxBmBY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=vpLS7BFnohKJ3hiZylIKpTGEzh08WVQ2IvTY8T4wFJK8lp/MKyl+ZvR7X9wowfqIg iq0WlGxSY5LlOZzDpjqPfQ098kpFAhB50bkPpvTtrgo/3ltFt3vvnn+Q+/UcsnTOA6 mVpUlnntPHHlziCwiUGYZjOVxEKmig40oAl7HTi4= From: Kieran Bingham Date: Mon, 02 Feb 2026 19:25:04 +0000 Subject: [PATCH 2/3] ipa: simple: Fix Ccm matrix multiplication MIME-Version: 1.0 Message-Id: <20260202-kbingham-fixups-v1-2-7d7dd4b2a27b@ideasonboard.com> References: <20260202-kbingham-fixups-v1-0-7d7dd4b2a27b@ideasonboard.com> In-Reply-To: <20260202-kbingham-fixups-v1-0-7d7dd4b2a27b@ideasonboard.com> To: libcamera-devel@lists.libcamera.org Cc: Kieran Bingham X-Mailer: b4 0.14.2 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" The CCM should be applied to the current combined Matrix. Fix the multiplication ordering. Fixes: 82ed6c19c2b3 ("libcamera: ipa: simple: Initialise the general correction matrix") Signed-off-by: Kieran Bingham --- src/ipa/simple/algorithms/ccm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ipa/simple/algorithms/ccm.cpp b/src/ipa/simple/algorithms/ccm.cpp index 911a5af2c90b55187f0d98519f3c29b8e0804567..90ea97b7f37ec78c747d355d7ba7ab517970b29d 100644 --- a/src/ipa/simple/algorithms/ccm.cpp +++ b/src/ipa/simple/algorithms/ccm.cpp @@ -54,7 +54,7 @@ void Ccm::prepare(IPAContext &context, [[maybe_unused]] const uint32_t frame, } context.activeState.combinedMatrix = - currentCcm_.value() * context.activeState.combinedMatrix; + context.activeState.combinedMatrix * currentCcm_.value(); frameContext.ccm = currentCcm_.value(); } From patchwork Mon Feb 2 19:25:05 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 26078 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 B3B51C32E7 for ; Mon, 2 Feb 2026 19:25:14 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9EBD361FFA; Mon, 2 Feb 2026 20:25:12 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="u/lYBJWs"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0DF3861FF4 for ; Mon, 2 Feb 2026 20:25:08 +0100 (CET) Received: from [192.168.0.240] (cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 48124E92; Mon, 2 Feb 2026 20:24:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1770060267; bh=k86tlSPaaXf1sYMuFSSFdrYicAecNZCn87HwnuqfMSs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=u/lYBJWstpqj1+SX6Czg65WPQB3k+ADoMfUfrwpd0v4xswOaLHsZKwdM+EQTnCaM7 nzZb8q4QMuBbNVz8wnuw01NmH4ebvsWd6G/JxxdGtcMRpIwTbihlmIclUIZ72RauRe sYmc7ML/GRL1WUM89K+RAUudZ1XK6n/gQtBuuqhk= From: Kieran Bingham Date: Mon, 02 Feb 2026 19:25:05 +0000 Subject: [PATCH 3/3] ipa: simple: Remove duplicate header inclusion MIME-Version: 1.0 Message-Id: <20260202-kbingham-fixups-v1-3-7d7dd4b2a27b@ideasonboard.com> References: <20260202-kbingham-fixups-v1-0-7d7dd4b2a27b@ideasonboard.com> In-Reply-To: <20260202-kbingham-fixups-v1-0-7d7dd4b2a27b@ideasonboard.com> To: libcamera-devel@lists.libcamera.org Cc: Kieran Bingham X-Mailer: b4 0.14.2 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" The Awb component already references libcamera/control_ids.h. Remove the incorrect duplicate inclusion of "control_ids.h". Signed-off-by: Kieran Bingham Reviewed-by: Milan Zamazal --- src/ipa/simple/algorithms/awb.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/ipa/simple/algorithms/awb.cpp b/src/ipa/simple/algorithms/awb.cpp index 6fdaacaba3183bc2efa348c4182b90201006b826..6369193c686c0c69de88cb60756a00557dbdbbd9 100644 --- a/src/ipa/simple/algorithms/awb.cpp +++ b/src/ipa/simple/algorithms/awb.cpp @@ -17,8 +17,6 @@ #include "libipa/colours.h" #include "simple/ipa_context.h" -#include "control_ids.h" - namespace libcamera { LOG_DEFINE_CATEGORY(IPASoftAwb)