From patchwork Mon Aug 4 14:48:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 24046 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 CCE49BDCC1 for ; Mon, 4 Aug 2025 14:48:10 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id DCB866921D; Mon, 4 Aug 2025 16:48:09 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="sSrHV5Rk"; dkim-atps=neutral Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2B42F6920D for ; Mon, 4 Aug 2025 16:48:08 +0200 (CEST) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-459d62184c9so8330215e9.1 for ; Mon, 04 Aug 2025 07:48:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1754318887; x=1754923687; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=xt6eCgrJgA37PRqJWve1gvQQlzRL6jql6nFUe3pl1qE=; b=sSrHV5RkXYM/MoIHlHl7kvqPmszfCibYPS0Ll/2CsPjd69iq3qZ4SILiSD0QYcXEhf k+WOALwt2CHe9Uo4Cbn5pf5O9knzk2h6sOFM+JMR/QUvXV9D3oWa7t4jpbHrsLMiSd9y +s7fP7Q4Zt17hNSHZ4EyWbQlNOf3GKWuLTei+jco21VDTkYd/1j1oWKXpJZt18f7XMpR bb1Opplkqd5uZ55fmBS/sJdVgVTFuw5L9t+xKFDD7IQr+qQNqyLvxKBy0t224vH97kP5 ik4kJElFOgKtociELzCbdHgFOuzT/AOoVCKSVZnV87K56pPKy+RIYTx6vJWnQm4d6AAd hPfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754318887; x=1754923687; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xt6eCgrJgA37PRqJWve1gvQQlzRL6jql6nFUe3pl1qE=; b=EvEMbhshWbtvc4V8U5/yO7IspKmwKr10VCAZSP6K5kTZrRrqh0tNZ7Iig+Ha5fs5D0 X3AanN90/lLM/4DEm4JH89vbmouoi+qOlj7Rs6sVIegZOXW1IUxER5GKshS2NOJr+nlB yDihsj32ZxZedAfHIBpPJZv+IFIOJrrGNSMzjo+x2dd3niqaruv60YNBkvHpQyBShWbA lo0/W8obCrspunwVNgG3/oZ0i3PoEgzBz/VJ8OZcS9uDoxS+kURH86ElAjkFJeFjjvRD alRIo3jjBGFYWTl+JPpXPWY6CO1hq5x1pMXt6q/U+ykf9xa9KgjP1fYZGcwO/yUsSocV Mabg== X-Gm-Message-State: AOJu0YzlKrCy7RtcpyH5yGufoDdTQbC6aoZfmZqotGfq1ywiTCAl3NUh CEHZ3BNdlHh8y11AhACMZNUV+GCNsFg3pv8AZ2N6BK9OHzFsJVlwDRxYyjmLMbj0N2wmkcRuV8u mwrac4hk= X-Gm-Gg: ASbGncstFiFgeowE7NLxwHJGWwQTBGatqVmZqlc6LheoFOj3nmBMyIMzMAhkXPj1RoD 51kd7QQBoTt/VZLo5xDH/TO8XfmmDkwgzKS+VnnDse+aBQj54YcEEZk8LfN/89htyCEDel1XEjP tGPz0IzqYrJuYNRh5KkTZaP7wAlUwwM2o/UrnX+8+Ue/Nr5e1aFG7uP/9rdQHnxMoia7ql/AY7S PV3b/d0PSsv5XMLyPxqCQlb5R0y5WzP2hfmvCyAZpwUklc1EkmkddvdJ5qUEBqEKumA0UEMDhZP /FcQyb94FEmSPOg9VgewQ2W8M9S+kHYpgndEgb81JKgRTNMzfqNcyDDb2z9Yg0NeM9Jt7nr5w+i SHs/cX7IfUCfjMGNthtQ7yj+o6JgVNl+AdRG6gutURpdScXnAAH1G4aBQbMMUbWWV X-Google-Smtp-Source: AGHT+IHFYMz8qmevcSytjW7leMJCP28iHiKr86lYmrWIZoeHCdMGN9qMvkw+7EGDZ3CzIb3j+mBYyQ== X-Received: by 2002:a05:600c:1391:b0:453:23fe:ca86 with SMTP id 5b1f17b1804b1-458b69c7d66mr75436195e9.4.1754318886872; Mon, 04 Aug 2025 07:48:06 -0700 (PDT) Received: from raspberrypi.pitowers.org ([2a00:1098:3142:1f:ffc9:aff6:7f7f:893b]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b79c3abf33sm15816078f8f.7.2025.08.04.07.48.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Aug 2025 07:48:06 -0700 (PDT) From: David Plowman To: libcamera-devel@lists.libcamera.org Cc: David Plowman Subject: [PATCH v2] ipa: rpi: ccm: Implement "manual" CCM mode Date: Mon, 4 Aug 2025 15:48:04 +0100 Message-Id: <20250804144804.16965-1-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.39.5 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" The CCM algorithm will now let an explicit colour matrix be set when AWB is in manual mode. We must handle any controls that can cause the AWB to be enabled or disabled first, so that we know the AWB's state correctly when we come to set the CCM. Signed-off-by: David Plowman Reviewed-by: Naushir Patuck --- src/ipa/rpi/common/ipa_base.cpp | 180 +++++++++++++++++++------ src/ipa/rpi/common/ipa_base.h | 2 + src/ipa/rpi/controller/ccm_algorithm.h | 6 + src/ipa/rpi/controller/rpi/ccm.cpp | 24 +++- src/ipa/rpi/controller/rpi/ccm.h | 5 +- 5 files changed, 170 insertions(+), 47 deletions(-) diff --git a/src/ipa/rpi/common/ipa_base.cpp b/src/ipa/rpi/common/ipa_base.cpp index ce2343e9..6448e6ab 100644 --- a/src/ipa/rpi/common/ipa_base.cpp +++ b/src/ipa/rpi/common/ipa_base.cpp @@ -94,6 +94,7 @@ const ControlInfoMap::Map ipaColourControls{ { &controls::AwbEnable, ControlInfo(false, true) }, { &controls::AwbMode, ControlInfo(controls::AwbModeValues) }, { &controls::ColourGains, ControlInfo(0.0f, 32.0f) }, + { &controls::ColourCorrectionMatrix, ControlInfo(0.0f, 8.0f) }, { &controls::ColourTemperature, ControlInfo(100, 100000) }, { &controls::Saturation, ControlInfo(0.0f, 32.0f, 1.0f) }, }; @@ -126,7 +127,7 @@ namespace ipa::RPi { IpaBase::IpaBase() : controller_(), frameLengths_(FrameLengthsQueueSize, 0s), statsMetadataOutput_(false), stitchSwapBuffers_(false), frameCount_(0), mistrustCount_(0), lastRunTimestamp_(0), - firstStart_(true), flickerState_({ 0, 0s }) + firstStart_(true), flickerState_({ 0, 0s }), awbEnabled_(true) { } @@ -821,6 +822,102 @@ void IpaBase::applyControls(const ControlList &controls) } } + /* + * We must also handle any AWB on/off changes first, so that the CCM algorithm + * knows its state correctly. + */ + const auto awbEnable = controls.get(controls::AwbEnable); + if (awbEnable) + do { + /* Silently ignore this control for a mono sensor. */ + if (monoSensor_) + break; + + RPiController::AwbAlgorithm *awb = dynamic_cast( + controller_.getAlgorithm("awb")); + if (!awb) { + LOG(IPARPI, Warning) + << "Could not set AWB_ENABLE - no AWB algorithm"; + break; + } + + awbEnabled_ = *awbEnable; + + if (!awbEnabled_) + awb->disableAuto(); + else { + awb->enableAuto(); + + /* The CCM algorithm must go back to auto as well. */ + RPiController::CcmAlgorithm *ccm = dynamic_cast( + controller_.getAlgorithm("ccm")); + if (ccm) + ccm->enableAuto(); + } + + libcameraMetadata_.set(controls::AwbEnable, awbEnabled_); + } while (false); + + const auto colourGains = controls.get(controls::ColourGains); + if (colourGains) + do { + /* Silently ignore this control for a mono sensor. */ + if (monoSensor_) + break; + + auto gains = *colourGains; + RPiController::AwbAlgorithm *awb = dynamic_cast( + controller_.getAlgorithm("awb")); + if (!awb) { + LOG(IPARPI, Warning) + << "Could not set COLOUR_GAINS - no AWB algorithm"; + break; + } + + awb->setManualGains(gains[0], gains[1]); + if (gains[0] != 0.0f && gains[1] != 0.0f) { + /* A gain of 0.0f will switch back to auto mode. */ + libcameraMetadata_.set(controls::ColourGains, + { gains[0], gains[1] }); + + awbEnabled_ = false; /* doing this puts AWB into manual mode */ + } else { + awbEnabled_ = true; /* doing this puts AWB into auto mode */ + + /* The CCM algorithm must go back to auto as well. */ + RPiController::CcmAlgorithm *ccm = dynamic_cast( + controller_.getAlgorithm("ccm")); + if (ccm) + ccm->enableAuto(); + } + + /* This metadata will get reported back automatically. */ + break; + } while (false); + + const auto colourTemperature = controls.get(controls::ColourTemperature); + if (colourTemperature) + do { + /* Silently ignore this control for a mono sensor. */ + if (monoSensor_) + break; + + auto temperatureK = *colourTemperature; + RPiController::AwbAlgorithm *awb = dynamic_cast( + controller_.getAlgorithm("awb")); + if (!awb) { + LOG(IPARPI, Warning) + << "Could not set COLOUR_TEMPERATURE - no AWB algorithm"; + break; + } + + awb->setColourTemperature(temperatureK); + awbEnabled_ = false; /* doing this puts AWB into manual mode */ + + /* This metadata will get reported back automatically. */ + break; + } while (false); + /* Iterate over controls */ for (auto const &ctrl : controls) { LOG(IPARPI, Debug) << "Request ctrl: " @@ -1037,25 +1134,7 @@ void IpaBase::applyControls(const ControlList &controls) } case controls::AWB_ENABLE: { - /* Silently ignore this control for a mono sensor. */ - if (monoSensor_) - break; - - RPiController::AwbAlgorithm *awb = dynamic_cast( - controller_.getAlgorithm("awb")); - if (!awb) { - LOG(IPARPI, Warning) - << "Could not set AWB_ENABLE - no AWB algorithm"; - break; - } - - if (ctrl.second.get() == false) - awb->disableAuto(); - else - awb->enableAuto(); - - libcameraMetadata_.set(controls::AwbEnable, - ctrl.second.get()); + /* We handled this one above. */ break; } @@ -1080,47 +1159,60 @@ void IpaBase::applyControls(const ControlList &controls) LOG(IPARPI, Error) << "AWB mode " << idx << " not recognised"; } + break; } case controls::COLOUR_GAINS: { - /* Silently ignore this control for a mono sensor. */ - if (monoSensor_) - break; - - auto gains = ctrl.second.get>(); - RPiController::AwbAlgorithm *awb = dynamic_cast( - controller_.getAlgorithm("awb")); - if (!awb) { - LOG(IPARPI, Warning) - << "Could not set COLOUR_GAINS - no AWB algorithm"; - break; - } - - awb->setManualGains(gains[0], gains[1]); - if (gains[0] != 0.0f && gains[1] != 0.0f) - /* A gain of 0.0f will switch back to auto mode. */ - libcameraMetadata_.set(controls::ColourGains, - { gains[0], gains[1] }); + /* We handled this one above. */ break; } case controls::COLOUR_TEMPERATURE: { - /* Silently ignore this control for a mono sensor. */ + /* We handled this one above. */ + break; + } + + case controls::COLOUR_CORRECTION_MATRIX: { if (monoSensor_) break; - auto temperatureK = ctrl.second.get(); + auto floats = ctrl.second.get>(); + RPiController::CcmAlgorithm *ccm = dynamic_cast( + controller_.getAlgorithm("ccm")); + if (!ccm) { + LOG(IPARPI, Warning) + << "Could not set COLOUR_CORRECTION_MATRIX - no CCM algorithm"; + break; + } + RPiController::AwbAlgorithm *awb = dynamic_cast( controller_.getAlgorithm("awb")); - if (!awb) { + if (awb && awbEnabled_) { LOG(IPARPI, Warning) - << "Could not set COLOUR_TEMPERATURE - no AWB algorithm"; + << "Could not set COLOUR_CORRECTION_MATRIX - AWB is active"; break; } - awb->setColourTemperature(temperatureK); - /* This metadata will get reported back automatically. */ + /* We are guaranteed this control contains 9 values. Nevertheless: */ + assert(floats.size() == 9); + + Matrix matrix; + for (std::size_t i = 0; i < 3; ++i) + for (std::size_t j = 0; j < 3; ++j) + matrix[i][j] = static_cast(floats[i * 3 + j]); + + ccm->setCcm(matrix); + + /* + * But if AWB is running, go back to auto mode. The CCM gets remembered, + * which avoids the race between setting the CCM and disabling AWB in + * the same set of controls. + */ + if (awbEnabled_) + ccm->enableAuto(); + + /* This metadata will be reported back automatically. */ break; } diff --git a/src/ipa/rpi/common/ipa_base.h b/src/ipa/rpi/common/ipa_base.h index e2f6e330..5348f2ea 100644 --- a/src/ipa/rpi/common/ipa_base.h +++ b/src/ipa/rpi/common/ipa_base.h @@ -140,6 +140,8 @@ private: int32_t mode; utils::Duration manualPeriod; } flickerState_; + + bool awbEnabled_; }; } /* namespace ipa::RPi */ diff --git a/src/ipa/rpi/controller/ccm_algorithm.h b/src/ipa/rpi/controller/ccm_algorithm.h index 6678ba75..785c408a 100644 --- a/src/ipa/rpi/controller/ccm_algorithm.h +++ b/src/ipa/rpi/controller/ccm_algorithm.h @@ -6,16 +6,22 @@ */ #pragma once +#include "libcamera/internal/matrix.h" + #include "algorithm.h" namespace RPiController { +using Matrix3x3 = libcamera::Matrix; + class CcmAlgorithm : public Algorithm { public: CcmAlgorithm(Controller *controller) : Algorithm(controller) {} /* A CCM algorithm must provide the following: */ + virtual void enableAuto() = 0; virtual void setSaturation(double saturation) = 0; + virtual void setCcm(Matrix3x3 const &matrix) = 0; }; } /* namespace RPiController */ diff --git a/src/ipa/rpi/controller/rpi/ccm.cpp b/src/ipa/rpi/controller/rpi/ccm.cpp index 8607f152..c42c0141 100644 --- a/src/ipa/rpi/controller/rpi/ccm.cpp +++ b/src/ipa/rpi/controller/rpi/ccm.cpp @@ -32,7 +32,10 @@ LOG_DEFINE_CATEGORY(RPiCcm) using Matrix3x3 = Matrix; Ccm::Ccm(Controller *controller) - : CcmAlgorithm(controller), saturation_(1.0) {} + : CcmAlgorithm(controller), enableAuto_(true), saturation_(1.0), + manualCcm_({ 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0 }) +{ +} char const *Ccm::name() const { @@ -78,11 +81,22 @@ int Ccm::read(const libcamera::YamlObject ¶ms) return 0; } +void Ccm::enableAuto() +{ + enableAuto_ = true; +} + void Ccm::setSaturation(double saturation) { saturation_ = saturation; } +void Ccm::setCcm(Matrix3x3 const &matrix) +{ + enableAuto_ = false; + manualCcm_ = matrix; +} + void Ccm::initialise() { } @@ -151,7 +165,13 @@ void Ccm::prepare(Metadata *imageMetadata) LOG(RPiCcm, Warning) << "no colour temperature found"; if (!luxOk) LOG(RPiCcm, Warning) << "no lux value found"; - Matrix3x3 ccm = calculateCcm(config_.ccms, awb.temperatureK); + + Matrix3x3 ccm; + if (enableAuto_) + ccm = calculateCcm(config_.ccms, awb.temperatureK); + else + ccm = manualCcm_; + double saturation = saturation_; struct CcmStatus ccmStatus; ccmStatus.saturation = saturation; diff --git a/src/ipa/rpi/controller/rpi/ccm.h b/src/ipa/rpi/controller/rpi/ccm.h index c05dbb17..70f28ed3 100644 --- a/src/ipa/rpi/controller/rpi/ccm.h +++ b/src/ipa/rpi/controller/rpi/ccm.h @@ -8,7 +8,6 @@ #include -#include "libcamera/internal/matrix.h" #include #include "../ccm_algorithm.h" @@ -33,13 +32,17 @@ public: Ccm(Controller *controller = NULL); char const *name() const override; int read(const libcamera::YamlObject ¶ms) override; + void enableAuto() override; void setSaturation(double saturation) override; + void setCcm(Matrix3x3 const &matrix) override; void initialise() override; void prepare(Metadata *imageMetadata) override; private: CcmConfig config_; + bool enableAuto_; double saturation_; + Matrix3x3 manualCcm_; }; } /* namespace RPiController */