From patchwork Tue Oct 28 09:31:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 24841 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 BF99BBE080 for ; Tue, 28 Oct 2025 09:32:19 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4CE21607A6; Tue, 28 Oct 2025 10:32:14 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Van7cVtN"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9FC37607A2 for ; Tue, 28 Oct 2025 10:32:08 +0100 (CET) Received: from [192.168.0.172] (mob-5-90-58-13.net.vodafone.it [5.90.58.13]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 13AFE1F0E; Tue, 28 Oct 2025 10:30:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1761643820; bh=V/LKpOf9yhdXRyBPE0ppKYaI4nGg8p0p2ziSbJ5qtY8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Van7cVtNxSOfKwy9ar479LdhcE+/AvjTudJ/BvCIJqm2vE3z+40iW/E69gCFM4Da7 j5Xx2UuyyRnl5SoDO+gztovfNRQ7/Y0q2wLP177LPAKezU2zA2C89h8xzQv9wzkc8n wW0KJP0EadKGx+U+kdKYpi+SRFn+C4TzNEasHY58= From: Jacopo Mondi Date: Tue, 28 Oct 2025 10:31:49 +0100 Subject: [PATCH v2 03/10] ipa: ipu3: Move CameraHelper to context MIME-Version: 1.0 Message-Id: <20251028-exposure-limits-v2-3-a8b5a318323e@ideasonboard.com> References: <20251028-exposure-limits-v2-0-a8b5a318323e@ideasonboard.com> In-Reply-To: <20251028-exposure-limits-v2-0-a8b5a318323e@ideasonboard.com> To: =?utf-8?q?Niklas_S=C3=B6derlund?= , Robert Mader , libcamera-devel@lists.libcamera.org Cc: Jacopo Mondi X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4027; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=V/LKpOf9yhdXRyBPE0ppKYaI4nGg8p0p2ziSbJ5qtY8=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBpAI2VhIPNLjHNbc6qJQ1o6nlXRY4ND7bRdHWn9 Qlplis7HeSJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCaQCNlQAKCRByNAaPFqFW PLjbD/wI4rcrIJpYZFr3WPiiMpNHQt78NrXbhewfcpOlMMzLDnJVYEf3nm4EG7PdFR8u4BkYWJs 8K3E8vu7YovxeIAZ/sUJ/rs/D2Rag4YOehFQ2iVu0TN+sQKWgact8r6kuYNFcbrEZaR/WC7Hp4U eHPmqsgw2dVeTuRowh8h7qp/stv3PTCbCMBAGmIWlDrJXbN0m9soRxB4z7H/n3kWww4S7Vh7cHn eEpy+Zlzr0vCMdC+wuR2BnBUVP7UxpJ+fU/eC3hFSGPk+aPrLYWQGAhTVn2ig98+3nYtXM4IG0r ucaW2XYA3VRTYIfdcvYlHEFmVZ1IhZmplkbgyxL+MPSzXfttoHdQHGD+bT4rNAAUdz8MRgHy7GO h189D/b1dN+DlxymyKp5UvtYvID0bFdOqUjjIszL+co8V1pM23otvJ4vvr5nLHpMgqSp3p/gzDA DWW+4o3DBTST6JRozLpuWfnOYVhYadSz+fkw7nKjO8hxLX3ckMKeYYfwwjqQCyw3EmboF3z+p0j gagI11402RnO+FPku9nO4NscWCq36qMbHjhbUqs+/G+jdvvG70XT6k5WglM24AfOY+EttgMZPZQ Eg0SzCVf6YTyqJxKOfS8FVj7MylZXVZGcZYZOE3cf7ahnz36QP9HnaNn+nZP3fbzcdo1Dcv75FP tqIhFKbAyb9SeAQ== X-Developer-Key: i=jacopo.mondi@ideasonboard.com; a=openpgp; fpr=72392EDC88144A65C701EA9BA5826A2587AD026B 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" Move the CameraHelper sensor to the Context so that it can be used by the algorithms directly. Signed-off-by: Jacopo Mondi --- src/ipa/ipu3/ipa_context.cpp | 3 +++ src/ipa/ipu3/ipa_context.h | 3 +++ src/ipa/ipu3/ipu3.cpp | 15 ++++++--------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/ipa/ipu3/ipa_context.cpp b/src/ipa/ipu3/ipa_context.cpp index 3b22f7917650d9e400d5368c2f890d6b2dc846a0..5d0ebaaec454fca823851228614a3eb229f0132b 100644 --- a/src/ipa/ipu3/ipa_context.cpp +++ b/src/ipa/ipu3/ipa_context.cpp @@ -54,6 +54,9 @@ namespace libcamera::ipa::ipu3 { * * \var IPAContext::ctrlMap * \brief A ControlInfoMap::Map of controls populated by the algorithms + * + * \var IPAContext::camHelper + * \brief The camera sensor helper */ /** diff --git a/src/ipa/ipu3/ipa_context.h b/src/ipa/ipu3/ipa_context.h index 97fcf06cd4ac9ac6d64c4933fcea80ace0e572df..4544d663642fb6fde1cf69a32f1c0fbb2fbd98f6 100644 --- a/src/ipa/ipu3/ipa_context.h +++ b/src/ipa/ipu3/ipa_context.h @@ -15,6 +15,7 @@ #include #include +#include #include namespace libcamera { @@ -95,6 +96,8 @@ struct IPAContext { FCQueue frameContexts; ControlInfoMap::Map ctrlMap; + + std::unique_ptr camHelper; }; } /* namespace ipa::ipu3 */ diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp index 1cae08bf255f6f53a0ebee02ba3aadda5a650ae3..36d8f0da430a3d4f94e2a3f760850519742ea992 100644 --- a/src/ipa/ipu3/ipu3.cpp +++ b/src/ipa/ipu3/ipu3.cpp @@ -179,9 +179,6 @@ private: IPACameraSensorInfo sensorInfo_; - /* Interface to the Camera Helper */ - std::unique_ptr camHelper_; - /* Local parameter storage */ struct IPAContext context_; }; @@ -222,8 +219,8 @@ void IPAIPU3::updateSessionConfiguration(const ControlInfoMap &sensorControls) */ context_.configuration.agc.minExposureTime = minExposure * context_.configuration.sensor.lineDuration; context_.configuration.agc.maxExposureTime = maxExposure * context_.configuration.sensor.lineDuration; - context_.configuration.agc.minAnalogueGain = camHelper_->gain(minGain); - context_.configuration.agc.maxAnalogueGain = camHelper_->gain(maxGain); + context_.configuration.agc.minAnalogueGain = context_.camHelper->gain(minGain); + context_.configuration.agc.maxAnalogueGain = context_.camHelper->gain(maxGain); } /** @@ -301,8 +298,8 @@ int IPAIPU3::init(const IPASettings &settings, const ControlInfoMap &sensorControls, ControlInfoMap *ipaControls) { - camHelper_ = CameraSensorHelperFactoryBase::create(settings.sensorModel); - if (camHelper_ == nullptr) { + context_.camHelper = CameraSensorHelperFactoryBase::create(settings.sensorModel); + if (context_.camHelper == nullptr) { LOG(IPAIPU3, Error) << "Failed to create camera sensor helper for " << settings.sensorModel; @@ -597,7 +594,7 @@ void IPAIPU3::processStats(const uint32_t frame, IPAFrameContext &frameContext = context_.frameContexts.get(frame); frameContext.sensor.exposure = sensorControls.get(V4L2_CID_EXPOSURE).get(); - frameContext.sensor.gain = camHelper_->gain(sensorControls.get(V4L2_CID_ANALOGUE_GAIN).get()); + frameContext.sensor.gain = context_.camHelper->gain(sensorControls.get(V4L2_CID_ANALOGUE_GAIN).get()); ControlList metadata(controls::controls); @@ -643,7 +640,7 @@ void IPAIPU3::queueRequest(const uint32_t frame, const ControlList &controls) void IPAIPU3::setControls(unsigned int frame) { int32_t exposure = context_.activeState.agc.exposure; - int32_t gain = camHelper_->gainCode(context_.activeState.agc.gain); + int32_t gain = context_.camHelper->gainCode(context_.activeState.agc.gain); ControlList ctrls(sensorCtrls_); ctrls.set(V4L2_CID_EXPOSURE, exposure);