From patchwork Thu Jan 23 14:07:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Scally X-Patchwork-Id: 22637 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 A37BABDE6B for ; Thu, 23 Jan 2025 14:07:55 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 418B568566; Thu, 23 Jan 2025 15:07:53 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="maqFTaZR"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 58EB36855B for ; Thu, 23 Jan 2025 15:07:46 +0100 (CET) Received: from mail.ideasonboard.com (cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net [86.13.91.161]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id B0E7A89A; Thu, 23 Jan 2025 15:06:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1737641202; bh=aRdq7cLKNsCqtN3GGXJJYxx7IUhDmvcDMHJ3PDLWDCs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=maqFTaZRO4hHWsW9mFLoHjtcUPjbldhVj1EGJWQybjIIYuPdNEJTYdLqcyAIX8wgx 79TRpifEuytFwCEpdrjBJjGLWiyPxPXFmLybjx5vnybBUKXdrZ5LyYcWh1Cqombcks D3nwrMI3LLujT8gcoIKgVwqnGhXXALjTnZx/+qhE= From: Daniel Scally To: libcamera-devel@lists.libcamera.org Cc: Daniel Scally , Laurent Pinchart , Paul Elder Subject: [PATCH v2 3/3] ipa: libipa: Add flicker controls to AgcMeanLuminance Date: Thu, 23 Jan 2025 14:07:27 +0000 Message-Id: <20250123140727.458567-4-dan.scally@ideasonboard.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250123140727.458567-1-dan.scally@ideasonboard.com> References: <20250123140727.458567-1-dan.scally@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" Add controls for AeFlickerMode and AeFlickerPeriod to the AgcMeanLuminance class. The controls passed to an algorithm's queueRequest() are forwarded to AgcMeanLuminance through a new function, and the values then passed to the ExposureModeHelper to be used in calculating the new exposure time. Take the opportunity to call the new parseControls() function in each of the derived class' queueRequest() function. Signed-off-by: Daniel Scally Reviewed-by: Laurent Pinchart Reviewed-by: Paul Elder --- Changes in v2: - Declared the controls using a span rather than min and max values - Used a std::optional to pass to the ExposureModeHelper. I didn't use it in the IPAContext, because it can't really be modelled as a single variable option there. src/ipa/ipu3/algorithms/agc.cpp | 3 +- src/ipa/libipa/agc_mean_luminance.cpp | 47 ++++++++++++++++++++++++++- src/ipa/libipa/agc_mean_luminance.h | 5 +++ src/ipa/mali-c55/algorithms/agc.cpp | 2 ++ src/ipa/rkisp1/algorithms/agc.cpp | 2 ++ 5 files changed, 57 insertions(+), 2 deletions(-) diff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp index 383b046c..b993aaa7 100644 --- a/src/ipa/ipu3/algorithms/agc.cpp +++ b/src/ipa/ipu3/algorithms/agc.cpp @@ -129,8 +129,9 @@ int Agc::configure(IPAContext &context, void Agc::queueRequest([[maybe_unused]] typename Module::Context &context, [[maybe_unused]] const uint32_t frame, [[maybe_unused]] typename Module::FrameContext &frameContext, - [[maybe_unused]] const ControlList &controls) + const ControlList &controls) { + parseControls(controls); } Histogram Agc::parseStatistics(const ipu3_uapi_stats_3a *stats, diff --git a/src/ipa/libipa/agc_mean_luminance.cpp b/src/ipa/libipa/agc_mean_luminance.cpp index 273ec4e5..65285bf1 100644 --- a/src/ipa/libipa/agc_mean_luminance.cpp +++ b/src/ipa/libipa/agc_mean_luminance.cpp @@ -137,6 +137,10 @@ static constexpr double kDefaultRelativeLuminanceTarget = 0.16; AgcMeanLuminance::AgcMeanLuminance() : frameCount_(0), filteredExposure_(0s), relativeLuminanceTarget_(0) { + controls_[&controls::AeFlickerMode] = ControlInfo({ { ControlValue(controls::FlickerOff), + ControlValue(controls::FlickerManual) } }, + ControlValue(controls::FlickerOff)); + controls_[&controls::AeFlickerPeriod] = ControlInfo(100, 1000000); } AgcMeanLuminance::~AgcMeanLuminance() = default; @@ -480,6 +484,39 @@ double AgcMeanLuminance::constraintClampGain(uint32_t constraintModeIndex, return gain; } +/** + * \brief Parse the controls passed to an algorithm for the ones we need + * \param[in] controls the ControlList passed to an algorithm by the IPA + * + * This function must be called by a derived class in its queueRequest() + * function so that we can extract the controls needed by this base class. + */ +void AgcMeanLuminance::parseControls(const ControlList &controls) +{ + const auto &flickerMode = controls.get(controls::AeFlickerMode); + if (flickerMode) { + switch (*flickerMode) { + case controls::AeFlickerModeEnum::FlickerOff: + case controls::AeFlickerModeEnum::FlickerManual: + flickerMode_ = static_cast(*flickerMode); + break; + default: + LOG(AgcMeanLuminance, Error) + << "Flicker mode " << *flickerMode << " is not supported"; + break; + } + } + + const auto &flickerPeriod = controls.get(controls::AeFlickerPeriod); + if (flickerPeriod) { + /* + * If at some future point we support automatic flicker + * mitigation then this will need revision. + */ + flickerPeriod_ = *flickerPeriod * 1.0us; + } +} + /** * \brief Apply a filter on the exposure value to limit the speed of changes * \param[in] exposureValue The target exposure from the AGC algorithm @@ -561,7 +598,15 @@ AgcMeanLuminance::calculateNewEv(uint32_t constraintModeIndex, newExposureValue = filterExposure(newExposureValue); frameCount_++; - return exposureModeHelper->splitExposure(newExposureValue, std::nullopt); + + std::optional flickerPeriod; + + if (flickerMode_ == controls::AeFlickerModeEnum::FlickerManual) + flickerPeriod = flickerPeriod_; + else + flickerPeriod = std::nullopt; + + return exposureModeHelper->splitExposure(newExposureValue, flickerPeriod); } /** diff --git a/src/ipa/libipa/agc_mean_luminance.h b/src/ipa/libipa/agc_mean_luminance.h index c41391cb..b9b36687 100644 --- a/src/ipa/libipa/agc_mean_luminance.h +++ b/src/ipa/libipa/agc_mean_luminance.h @@ -14,6 +14,7 @@ #include +#include #include #include "libcamera/internal/yaml_parser.h" @@ -71,6 +72,8 @@ public: frameCount_ = 0; } + void parseControls(const ControlList &controls); + private: virtual double estimateLuminance(const double gain) const = 0; @@ -87,6 +90,8 @@ private: uint64_t frameCount_; utils::Duration filteredExposure_; double relativeLuminanceTarget_; + utils::Duration flickerPeriod_; + controls::AeFlickerModeEnum flickerMode_; std::map> constraintModes_; std::map> exposureModeHelpers_; diff --git a/src/ipa/mali-c55/algorithms/agc.cpp b/src/ipa/mali-c55/algorithms/agc.cpp index 70667db3..6a80c44f 100644 --- a/src/ipa/mali-c55/algorithms/agc.cpp +++ b/src/ipa/mali-c55/algorithms/agc.cpp @@ -238,6 +238,8 @@ void Agc::queueRequest(IPAContext &context, const uint32_t frame, << "Digital gain set to " << agc.manual.ispGain << " on request sequence " << frame; } + + parseControls(controls); } size_t Agc::fillGainParamBlock(IPAContext &context, IPAFrameContext &frameContext, diff --git a/src/ipa/rkisp1/algorithms/agc.cpp b/src/ipa/rkisp1/algorithms/agc.cpp index 1680669c..fd2eda96 100644 --- a/src/ipa/rkisp1/algorithms/agc.cpp +++ b/src/ipa/rkisp1/algorithms/agc.cpp @@ -315,6 +315,8 @@ void Agc::queueRequest(IPAContext &context, agc.maxFrameDuration = maxFrameDuration; } frameContext.agc.maxFrameDuration = agc.maxFrameDuration; + + parseControls(controls); } /**