{"id":24153,"url":"https://patchwork.libcamera.org/api/1.1/patches/24153/?format=json","web_url":"https://patchwork.libcamera.org/patch/24153/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20250818082909.2001635-4-stefan.klug@ideasonboard.com>","date":"2025-08-18T08:28:41","name":"[RFC,3/4] ipa: ipu3: agc: Do not derive from AgcMeanLuminance","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"05c204e9af83870061bc1f6bf3dff6bcdf94bc24","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/1.1/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/24153/mbox/","series":[{"id":5390,"url":"https://patchwork.libcamera.org/api/1.1/series/5390/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5390","date":"2025-08-18T08:28:38","name":"libipa: agc_mean_luminance: Use composition instead of","version":1,"mbox":"https://patchwork.libcamera.org/series/5390/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/24153/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/24153/checks/","tags":{},"headers":{"Return-Path":"","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 0384FBEFBE\n\tfor ;\n\tMon, 18 Aug 2025 08:30:06 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8BDF169259;\n\tMon, 18 Aug 2025 10:30:05 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3B3646924E\n\tfor ;\n\tMon, 18 Aug 2025 10:30:03 +0200 (CEST)","from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:766d:a405:f64e:fe3a])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 0A02424BE; \n\tMon, 18 Aug 2025 10:29:06 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"ik18Yrdb\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1755505746;\n\tbh=6jzDvdboo84V131qpkgcoDeid+kHQ5gj8RUk/HCq+3o=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=ik18YrdbGdRIlRpFAWLItDPXpMaJkjUWmR5YDMmnuJT109M2WN2nMsjqvP5U/8YZv\n\trJLzH7Fxe0V9P620hPAIxHM9vrIQcFjwHxSd7jBDwBCTmbqyLqU0Ge1JEq7iRGhdDv\n\t2T9w1mIYUVvIbPnrv//SpPcslpQUQvlPbe47x1zs=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ","Subject":"[RFC PATCH 3/4] ipa: ipu3: agc: Do not derive from AgcMeanLuminance","Date":"Mon, 18 Aug 2025 10:28:41 +0200","Message-ID":"<20250818082909.2001635-4-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.48.1","In-Reply-To":"<20250818082909.2001635-1-stefan.klug@ideasonboard.com>","References":"<20250818082909.2001635-1-stefan.klug@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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"There is no need to derive from AgcMeanLuminance anymore. Use\ncomposition for easier understanding.\n\nSigned-off-by: Stefan Klug \n---\n src/ipa/ipu3/algorithms/agc.cpp | 22 +++++++++++-----------\n src/ipa/ipu3/algorithms/agc.h | 4 +++-\n 2 files changed, 14 insertions(+), 12 deletions(-)","diff":"diff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp\nindex 98a034a47625..3a1d81734cad 100644\n--- a/src/ipa/ipu3/algorithms/agc.cpp\n+++ b/src/ipa/ipu3/algorithms/agc.cpp\n@@ -77,11 +77,11 @@ int Agc::init(IPAContext &context, const YamlObject &tuningData)\n {\n \tint ret;\n \n-\tret = parseTuningData(tuningData);\n+\tret = agc_.parseTuningData(tuningData);\n \tif (ret)\n \t\treturn ret;\n \n-\tcontext.ctrlMap.merge(controls());\n+\tcontext.ctrlMap.merge(agc_.controls());\n \n \treturn 0;\n }\n@@ -113,13 +113,13 @@ int Agc::configure(IPAContext &context,\n \tactiveState.agc.gain = minAnalogueGain_;\n \tactiveState.agc.exposure = 10ms / configuration.sensor.lineDuration;\n \n-\tcontext.activeState.agc.constraintMode = constraintModes().begin()->first;\n-\tcontext.activeState.agc.exposureMode = exposureModeHelpers().begin()->first;\n+\tcontext.activeState.agc.constraintMode = agc_.constraintModes().begin()->first;\n+\tcontext.activeState.agc.exposureMode = agc_.exposureModeHelpers().begin()->first;\n \n \t/* \\todo Run this again when FrameDurationLimits is passed in */\n-\tsetLimits(minExposureTime_, maxExposureTime_, minAnalogueGain_,\n-\t\t maxAnalogueGain_);\n-\tresetFrameCount();\n+\tagc_.setLimits(minExposureTime_, maxExposureTime_, minAnalogueGain_,\n+\t\t maxAnalogueGain_);\n+\tagc_.resetFrameCount();\n \n \treturn 0;\n }\n@@ -225,10 +225,10 @@ void Agc::process(IPAContext &context, [[maybe_unused]] const uint32_t frame,\n \tutils::Duration newExposureTime;\n \tdouble aGain, dGain;\n \tstd::tie(newExposureTime, aGain, dGain) =\n-\t\tcalculateNewEv(std::bind(&Agc::estimateLuminance, this, _1),\n-\t\t\t context.activeState.agc.constraintMode,\n-\t\t\t context.activeState.agc.exposureMode, hist,\n-\t\t\t effectiveExposureValue);\n+\t\tagc_.calculateNewEv(std::bind(&Agc::estimateLuminance, this, _1),\n+\t\t\t\t context.activeState.agc.constraintMode,\n+\t\t\t\t context.activeState.agc.exposureMode, hist,\n+\t\t\t\t effectiveExposureValue);\n \n \tLOG(IPU3Agc, Debug)\n \t\t<< \"Divided up exposure time, analogue gain and digital gain are \"\ndiff --git a/src/ipa/ipu3/algorithms/agc.h b/src/ipa/ipu3/algorithms/agc.h\nindex 8e182cd7cff3..a9ba78028251 100644\n--- a/src/ipa/ipu3/algorithms/agc.h\n+++ b/src/ipa/ipu3/algorithms/agc.h\n@@ -24,7 +24,7 @@ struct IPACameraSensorInfo;\n \n namespace ipa::ipu3::algorithms {\n \n-class Agc : public Algorithm, public AgcMeanLuminance\n+class Agc : public Algorithm\n {\n public:\n \tAgc();\n@@ -42,6 +42,8 @@ private:\n \tHistogram parseStatistics(const ipu3_uapi_stats_3a *stats,\n \t\t\t\t const ipu3_uapi_grid_config &grid);\n \n+\tAgcMeanLuminance agc_;\n+\n \tutils::Duration minExposureTime_;\n \tutils::Duration maxExposureTime_;\n \n","prefixes":["RFC","3/4"]}