From patchwork Fri Aug 29 09:10:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 24263 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 0E9C9C32BB for ; Fri, 29 Aug 2025 09:10:42 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 8ACB36931B; Fri, 29 Aug 2025 11:10:41 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="c9cdqFFo"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7DA46692DF for ; Fri, 29 Aug 2025 11:10:38 +0200 (CEST) Received: from neptunite.hamster-moth.ts.net (unknown [IPv6:2404:7a81:160:2100:af44:1f54:23d7:1088]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 1F0164B74; Fri, 29 Aug 2025 11:09:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1756458573; bh=z+MBMMjBikMkn+xybDV065KU8O/9NSa+XKkT7EUEYok=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c9cdqFFoZMZ/lxz2/wRcNPp/ZzaR6hzivTbM57NXxlAZg+n9zfqM924S0wBa22Lf1 lwKY9+yYXnGXG5wAzLF9NTXAA5e6ZY5aKlh0/kPJ189cf6OgFXnFKNhYIeQt+MI2ln XA+rkeK2I3Yihhbq2q7hWbz28EP4oDkvOw3pUklQ= From: Paul Elder To: libcamera-devel@lists.libcamera.org Cc: Paul Elder , david.plowman@raspberrypi.com, naush@raspberrypi.com, kieran.bingham@ideasonboard.com, stefan.klug@ideasonboard.com Subject: [PATCH 4/4] ipa: rkisp1: agc: Add support for sync Date: Fri, 29 Aug 2025 18:10:10 +0900 Message-ID: <20250829091011.2628954-5-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250829091011.2628954-1-paul.elder@ideasonboard.com> References: <20250829091011.2628954-1-paul.elder@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 sync support to the RkISP1 IPA using the SyncHelper from libipa. The syncAdjustment is saved in the frameContext (as opposed to getting it from the SyncHelper) to avoid potential races and ensure that the same value that was set into vblank will be returned in metadata. Signed-off-by: Paul Elder --- src/ipa/rkisp1/algorithms/agc.cpp | 22 +++++++++++++++++++++- src/ipa/rkisp1/algorithms/agc.h | 3 ++- src/ipa/rkisp1/ipa_context.h | 1 + 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/ipa/rkisp1/algorithms/agc.cpp b/src/ipa/rkisp1/algorithms/agc.cpp index bb1558df5422..9a27696ff868 100644 --- a/src/ipa/rkisp1/algorithms/agc.cpp +++ b/src/ipa/rkisp1/algorithms/agc.cpp @@ -156,6 +156,15 @@ int Agc::init(IPAContext &context, const YamlObject &tuningData) ControlValue(controls::AnalogueGainModeManual) } }, ControlValue(controls::AnalogueGainModeAuto)); context.ctrlMap[&controls::ExposureValue] = ControlInfo(-8.0f, 8.0f, 0.0f); + /* + * Insert the controlInfo for sync. Since FrameDurationLimits is only + * set *after* the algorithms are initialized, we have no information + * on it here. Use a sensible default here and update it later in + * configure(). + * \todo Move FrameDurationLimits from the base IPA to AGC + */ + context.ctrlMap[&controls::SyncAdjustment] = controlInfo(120000); + /* Insert the controls for agc */ context.ctrlMap.merge(controls()); return 0; @@ -202,7 +211,11 @@ int Agc::configure(IPAContext &context, const IPACameraSensorInfo &configInfo) context.configuration.sensor.minAnalogueGain, context.configuration.sensor.maxAnalogueGain); + context.ctrlMap[&controls::SyncAdjustment] = + controlInfo(frameDurationLimits.max().get()); + resetFrameCount(); + resetSync(); return 0; } @@ -324,6 +337,10 @@ void Agc::queueRequest(IPAContext &context, } frameContext.agc.minFrameDuration = agc.minFrameDuration; frameContext.agc.maxFrameDuration = agc.maxFrameDuration; + + const auto &sync = controls.get(controls::SyncAdjustment); + if (sync) + setSync(*sync, frameContext.agc.minFrameDuration); } /** @@ -413,6 +430,7 @@ void Agc::fillMetadata(IPAContext &context, IPAFrameContext &frameContext, metadata.set(controls::AeExposureMode, frameContext.agc.exposureMode); metadata.set(controls::AeConstraintMode, frameContext.agc.constraintMode); metadata.set(controls::ExposureValue, frameContext.agc.exposureValue); + metadata.set(controls::SyncAdjustment, frameContext.agc.syncAdjustment.count()); } /** @@ -471,7 +489,9 @@ void Agc::processFrameDuration(IPAContext &context, IPACameraSensorInfo &sensorInfo = context.sensorInfo; utils::Duration lineDuration = context.configuration.sensor.lineDuration; - frameContext.agc.vblank = (frameDuration / lineDuration) - sensorInfo.outputSize.height; + utils::Duration sync = getSync(); + frameContext.agc.vblank = ((frameDuration + sync) / lineDuration) - sensorInfo.outputSize.height; + frameContext.agc.syncAdjustment = sync; /* Update frame duration accounting for line length quantization. */ frameContext.agc.frameDuration = (sensorInfo.outputSize.height + frameContext.agc.vblank) * lineDuration; diff --git a/src/ipa/rkisp1/algorithms/agc.h b/src/ipa/rkisp1/algorithms/agc.h index 7867eed9c4e3..4441a519e857 100644 --- a/src/ipa/rkisp1/algorithms/agc.h +++ b/src/ipa/rkisp1/algorithms/agc.h @@ -15,6 +15,7 @@ #include #include "libipa/agc_mean_luminance.h" +#include "libipa/sync_helper.h" #include "algorithm.h" @@ -22,7 +23,7 @@ namespace libcamera { namespace ipa::rkisp1::algorithms { -class Agc : public Algorithm, public AgcMeanLuminance +class Agc : public Algorithm, public AgcMeanLuminance, public SyncHelper { public: Agc(); diff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h index 7ccc7b501aff..c21ab77b2ba5 100644 --- a/src/ipa/rkisp1/ipa_context.h +++ b/src/ipa/rkisp1/ipa_context.h @@ -143,6 +143,7 @@ struct IPAFrameContext : public FrameContext { bool updateMetering; bool autoExposureModeChange; bool autoGainModeChange; + utils::Duration syncAdjustment; } agc; struct {