From patchwork Wed Nov 18 13:15:19 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 29016 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 D9B67BDE17 for ; Wed, 18 Nov 2026 14:07:31 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 915B96A902; Wed, 18 Nov 2026 15:07:30 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="Ci2CzAjV"; dkim-atps=neutral Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 360306A8F5 for ; Wed, 18 Nov 2026 15:07:25 +0100 (CET) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4a5177d78c7so8959995e9.2 for ; Wed, 18 Nov 2026 06:07:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1795010844; x=1795615644; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=+O2hLIPKAk8t7N6RT5anuKWyP9/LdTGn6sQCWbheCIY=; b=Ci2CzAjVTF/M4MD1Fqh/KEJDbzK3GVx5dUt9ZjMPsu7NSWAjwwpoQMlZAaFVP2eXdF hWsgaaqfG+i1A6k+/Uab8ZeOWeIGjPunoQbZVRTjVg6f7XrB5dCNxec55AJVDYpIQC7Y INKWu+9bSQmnaieuzchAcqvR1n9JdTjWX0CJn1AVtyFkjQ1517JWCw1ylMsA5A8MFiQb Bh5DlYXuuAV4Sw4ETMHefEizm/eVeFpA3z9Pf98TEBkBzsHtSJvrvRBol8X4evL85QSy KT3AvdDmcrlCUaJR26VaacYQxzT7iR4FJrp9gKJYjZtzGJr39rE6Yp0bN1LmThC+9uuS 4Oqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795010844; x=1795615644; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=+O2hLIPKAk8t7N6RT5anuKWyP9/LdTGn6sQCWbheCIY=; b=vPNsmBUIBnsq7Dyqn+83Odi+sGsB614AMtAMTtV3OY6wgIeKjGm5DSQi3RxMNx1jPW EPEk0Sqofu0pjIdEqMCz3L03vfsQZAs+Jtd0iNNIOAJVhccOkf9R5Sm6cLelkNaLR9mC KqFHH4eiD9SOa5sk+hkvgCHjObCGEDhIKFWM1iMCnxUJUDRsTSQ15+wg2xkztAFdexzr jTmX40TnV+ouR6AI0KIqdU+bZYCySuwKtHHCrmitdmgDC6PBn2Kgj7TtTsihQTqM5cVM hSag0Cs9iKc3nWzTXSKOkIpz/kLMZKtj5f/+snuqMAoz9x0Igu5gBy4ztBS1uYw6XuiZ gNOQ== X-Gm-Message-State: APuU4Z/+1q7IjGHX1+g6mTlSasnfN955X8r29DPcx6fy28tZ7Q3fJPln Jq0plC9kDVFCHIQlGhAWhzKWcfrps2tfciys/8drWvYY1BtTX+2lirO+k5ndUViIApj6MyW+VzN 5cZ08 X-Gm-Gg: AYBFou2b6W0v5MnyQO9eDnjev6iMG94FNYtGDul/BM3eUD3+KTkt35OYZB67yDu21l8 XCYE67k350gD0WuotNrd47UvcPrHfNGL+4XGSRtWQXBO8UJ3MP2zNKVJvBOvUBdWviTpzDVFQ3Q 7OgURgEUHPGknf2WE1soVTp1nSvS8Tqzh2ybfQMt9O7WD+8Ej55isgp97gaslxchG1mSHAa8nfR Fu84JtJrpiCYggX+AcuAg4mtfgwKpf+uBoCy0arUnH3sbiPlMwJCa3B+hOd+HyruvwmpeBTx8nV JjsiDc6u/d2YmMPfs3r8GhhqOhTcpdFTFWF4cQNOIgLCKzJwQbAVC/KiHj0HfnlC/dku+F0mclP vA0qghpR1voSwMiPailJ0xj438wVZFtKLgXeGZ8l15RdvP38E5AtlMye0zLZVoESytOKsTd1URP yW/fwSVOMOn/TL0Znd74/pawhJZYUPBRTLT54/4LtflY6wkws+2ffKk8Q2RQPLm2tWeMeonfx0y 7i4LYjVlJeFMMlYFxVQ8ejG98apUK+HHHrUU+YODzuJN4lKlI7Ts0Yavc2dIc51Et+OqbT1IbRA BqnoeyYTF/yfT91yHxrObSkYRuLIGPGaIe/lz2PDSjTKLY8ybfJw0CRGnMPdgPEkQBfRl63x5Yl Ztf70EJiUlV4eozJiATQa7xPqdHJy5Pnt6AiiAsqfYV5QMr0cCYNllv+Nsdi0SkZEItkm X-Received: by 2002:a05:600c:46d3:b0:4a3:12fb:1ee7 with SMTP id 5b1f17b1804b1-4bb7da25b6cmr53180885e9.25.1795010843984; Wed, 18 Nov 2026 06:07:23 -0800 (PST) Received: from davidp-hailo.pitowers.org ([2a00:1098:3142:1f:2ecf:67ff:fe94:e2e6]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4bb7d29c7b7sm55274085e9.5.2026.11.18.06.07.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2026 06:07:23 -0800 (PST) From: David Plowman To: libcamera-devel@lists.libcamera.org Cc: David Plowman Subject: [PATCH v1 3/3] ipa: rpi: Pass the raw stream buffer to the control algorithms Date: Wed, 18 Nov 2026 13:15:19 +0000 Message-ID: <20261118140719.46849-4-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261118140719.46849-1-david.plowman@raspberrypi.com> References: <20261118140719.46849-1-david.plowman@raspberrypi.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" The raw stream buffer, plus its shared fd, is now passed to all the control algorithms. The Controller and Algorithm prepare methods have been updated to accept the raw buffer (though none makes use of it at the moment). Signed-off-by: David Plowman --- src/ipa/rpi/common/ipa_base.cpp | 9 ++++++++- src/ipa/rpi/controller/algorithm.cpp | 3 ++- src/ipa/rpi/controller/algorithm.h | 2 +- src/ipa/rpi/controller/controller.cpp | 4 ++-- src/ipa/rpi/controller/controller.h | 11 +++++++++-- src/ipa/rpi/controller/rpi/af.cpp | 3 ++- src/ipa/rpi/controller/rpi/af.h | 2 +- src/ipa/rpi/controller/rpi/agc.cpp | 3 ++- src/ipa/rpi/controller/rpi/agc.h | 2 +- src/ipa/rpi/controller/rpi/alsc.cpp | 3 ++- src/ipa/rpi/controller/rpi/alsc.h | 2 +- src/ipa/rpi/controller/rpi/awb.cpp | 3 ++- src/ipa/rpi/controller/rpi/awb.h | 2 +- src/ipa/rpi/controller/rpi/black_level.cpp | 3 ++- src/ipa/rpi/controller/rpi/black_level.h | 2 +- src/ipa/rpi/controller/rpi/cac.cpp | 3 ++- src/ipa/rpi/controller/rpi/cac.h | 2 +- src/ipa/rpi/controller/rpi/ccm.cpp | 3 ++- src/ipa/rpi/controller/rpi/ccm.h | 2 +- src/ipa/rpi/controller/rpi/contrast.cpp | 3 ++- src/ipa/rpi/controller/rpi/contrast.h | 2 +- src/ipa/rpi/controller/rpi/decompand.cpp | 3 ++- src/ipa/rpi/controller/rpi/decompand.h | 2 +- src/ipa/rpi/controller/rpi/denoise.cpp | 3 ++- src/ipa/rpi/controller/rpi/denoise.h | 2 +- src/ipa/rpi/controller/rpi/dpc.cpp | 3 ++- src/ipa/rpi/controller/rpi/dpc.h | 2 +- src/ipa/rpi/controller/rpi/geq.cpp | 3 ++- src/ipa/rpi/controller/rpi/geq.h | 2 +- src/ipa/rpi/controller/rpi/hdr.cpp | 3 ++- src/ipa/rpi/controller/rpi/hdr.h | 2 +- src/ipa/rpi/controller/rpi/lux.cpp | 3 ++- src/ipa/rpi/controller/rpi/lux.h | 2 +- src/ipa/rpi/controller/rpi/noise.cpp | 3 ++- src/ipa/rpi/controller/rpi/noise.h | 2 +- src/ipa/rpi/controller/rpi/saturation.cpp | 3 ++- src/ipa/rpi/controller/rpi/saturation.h | 2 +- src/ipa/rpi/controller/rpi/sdn.cpp | 3 ++- src/ipa/rpi/controller/rpi/sdn.h | 2 +- src/ipa/rpi/controller/rpi/sharpen.cpp | 3 ++- src/ipa/rpi/controller/rpi/sharpen.h | 2 +- src/ipa/rpi/controller/rpi/tonemap.cpp | 3 ++- src/ipa/rpi/controller/rpi/tonemap.h | 2 +- 43 files changed, 79 insertions(+), 45 deletions(-) diff --git a/src/ipa/rpi/common/ipa_base.cpp b/src/ipa/rpi/common/ipa_base.cpp index 6707ab11..baf26139 100644 --- a/src/ipa/rpi/common/ipa_base.cpp +++ b/src/ipa/rpi/common/ipa_base.cpp @@ -496,9 +496,16 @@ void IpaBase::prepareIsp(const PrepareParams ¶ms) if (controller_.getHardwareConfig().statsInline) processStats({ params.buffers, params.ipaContext }); + /* The Bayer image buffer, plus its fd, is passed to all the IPAs. */ + auto bayerIt = buffers_.find(params.buffers.bayer); + auto bayerFdIt = buffersFds_.find(params.buffers.bayer); + ASSERT(bayerIt != buffers_.end() && bayerFdIt != buffersFds_.end()); + const RPiController::SharedBuffer bayerBuffer{ bayerFdIt->second, + bayerIt->second.planes()[0] }; + /* Do we need/want to call prepare? */ if (processPending_) { - controller_.prepare(&rpiMetadata); + controller_.prepare(&rpiMetadata, bayerBuffer); /* Actually prepare the ISP parameters for the frame. */ platformPrepareIsp(params, rpiMetadata); platformPrepareAgc(rpiMetadata); diff --git a/src/ipa/rpi/controller/algorithm.cpp b/src/ipa/rpi/controller/algorithm.cpp index 82bc0302..8330eef1 100644 --- a/src/ipa/rpi/controller/algorithm.cpp +++ b/src/ipa/rpi/controller/algorithm.cpp @@ -23,7 +23,8 @@ void Algorithm::switchMode([[maybe_unused]] CameraMode const &cameraMode, { } -void Algorithm::prepare([[maybe_unused]] Metadata *imageMetadata) +void Algorithm::prepare([[maybe_unused]] Metadata *imageMetadata, + [[maybe_unused]] const SharedBuffer &bayerBuffer) { } diff --git a/src/ipa/rpi/controller/algorithm.h b/src/ipa/rpi/controller/algorithm.h index 214b0657..37dacd33 100644 --- a/src/ipa/rpi/controller/algorithm.h +++ b/src/ipa/rpi/controller/algorithm.h @@ -35,7 +35,7 @@ public: virtual int read(const libcamera::ValueNode ¶ms); virtual void initialise(); virtual void switchMode(CameraMode const &cameraMode, Metadata *metadata); - virtual void prepare(Metadata *imageMetadata); + virtual void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer); virtual void process(StatisticsPtr &stats, Metadata *imageMetadata); Metadata &getGlobalMetadata() const { diff --git a/src/ipa/rpi/controller/controller.cpp b/src/ipa/rpi/controller/controller.cpp index 168ab649..94a9f216 100644 --- a/src/ipa/rpi/controller/controller.cpp +++ b/src/ipa/rpi/controller/controller.cpp @@ -192,11 +192,11 @@ void Controller::switchMode(CameraMode const &cameraMode, Metadata *metadata) switchModeCalled_ = true; } -void Controller::prepare(Metadata *imageMetadata) +void Controller::prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) { assert(switchModeCalled_); for (auto &algo : algorithms_) - algo->prepare(imageMetadata); + algo->prepare(imageMetadata, bayerBuffer); } void Controller::process(StatisticsPtr stats, Metadata *imageMetadata) diff --git a/src/ipa/rpi/controller/controller.h b/src/ipa/rpi/controller/controller.h index 094917b0..c3cb1d98 100644 --- a/src/ipa/rpi/controller/controller.h +++ b/src/ipa/rpi/controller/controller.h @@ -12,9 +12,13 @@ * convenient manner. */ -#include +#include +#include #include +#include +#include +#include #include #include "libcamera/internal/value_node.h" @@ -28,6 +32,9 @@ namespace RPiController { class Algorithm; typedef std::unique_ptr AlgorithmPtr; +/* A shorthand for tying together a buffer with its shared FD. */ +using SharedBuffer = std::pair>; + /* * The Controller holds a pointer to some global_metadata, which is how * different controllers and control algorithms within them can exchange @@ -57,7 +64,7 @@ public: int read(char const *filename); void initialise(); void switchMode(CameraMode const &cameraMode, Metadata *metadata); - void prepare(Metadata *imageMetadata); + void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer); void process(StatisticsPtr stats, Metadata *imageMetadata); Metadata &getGlobalMetadata(); Algorithm *getAlgorithm(std::string const &name) const; diff --git a/src/ipa/rpi/controller/rpi/af.cpp b/src/ipa/rpi/controller/rpi/af.cpp index dd5b5651..a177fdfb 100644 --- a/src/ipa/rpi/controller/rpi/af.cpp +++ b/src/ipa/rpi/controller/rpi/af.cpp @@ -772,7 +772,8 @@ void Af::goIdle() * so we can terminate the scan early without having to change our minds. */ -void Af::prepare(Metadata *imageMetadata) +void Af::prepare(Metadata *imageMetadata, + [[maybe_unused]] const SharedBuffer &bayerBuffer) { /* Initialize for triggered scan or start of CAF mode */ if (scanState_ == ScanState::Trigger) diff --git a/src/ipa/rpi/controller/rpi/af.h b/src/ipa/rpi/controller/rpi/af.h index c9b48f86..161b45f7 100644 --- a/src/ipa/rpi/controller/rpi/af.h +++ b/src/ipa/rpi/controller/rpi/af.h @@ -52,7 +52,7 @@ public: /* IPA calls */ void switchMode(CameraMode const &cameraMode, Metadata *metadata) override; - void prepare(Metadata *imageMetadata) override; + void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override; void process(StatisticsPtr &stats, Metadata *imageMetadata) override; /* controls */ diff --git a/src/ipa/rpi/controller/rpi/agc.cpp b/src/ipa/rpi/controller/rpi/agc.cpp index 0c4f2596..72000b6e 100644 --- a/src/ipa/rpi/controller/rpi/agc.cpp +++ b/src/ipa/rpi/controller/rpi/agc.cpp @@ -297,7 +297,8 @@ setCurrentChannelIndexGetExposure(Metadata *metadata, const char *message, unsig return dur; } -void Agc::prepare(Metadata *imageMetadata) +void Agc::prepare(Metadata *imageMetadata, + [[maybe_unused]] const SharedBuffer &bayerBuffer) { /* * The DeviceStatus in the metadata should be correct for the image we diff --git a/src/ipa/rpi/controller/rpi/agc.h b/src/ipa/rpi/controller/rpi/agc.h index 5189ad2a..9667f6d2 100644 --- a/src/ipa/rpi/controller/rpi/agc.h +++ b/src/ipa/rpi/controller/rpi/agc.h @@ -47,7 +47,7 @@ public: void disableAutoGain() override; bool autoGainEnabled() const override; void switchMode(CameraMode const &cameraMode, Metadata *metadata) override; - void prepare(Metadata *imageMetadata) override; + void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override; void process(StatisticsPtr &stats, Metadata *imageMetadata) override; void setActiveChannels(const std::vector &activeChannels) override; diff --git a/src/ipa/rpi/controller/rpi/alsc.cpp b/src/ipa/rpi/controller/rpi/alsc.cpp index e13d6c6c..c61d4ef4 100644 --- a/src/ipa/rpi/controller/rpi/alsc.cpp +++ b/src/ipa/rpi/controller/rpi/alsc.cpp @@ -381,7 +381,8 @@ void Alsc::restartAsync(StatisticsPtr &stats, Metadata *imageMetadata) asyncSignal_.notify_one(); } -void Alsc::prepare(Metadata *imageMetadata) +void Alsc::prepare(Metadata *imageMetadata, + [[maybe_unused]] const SharedBuffer &bayerBuffer) { /* * Count frames since we started, and since we last poked the async diff --git a/src/ipa/rpi/controller/rpi/alsc.h b/src/ipa/rpi/controller/rpi/alsc.h index 0952ae83..bb587529 100644 --- a/src/ipa/rpi/controller/rpi/alsc.h +++ b/src/ipa/rpi/controller/rpi/alsc.h @@ -113,7 +113,7 @@ public: void initialise() override; void switchMode(CameraMode const &cameraMode, Metadata *metadata) override; int read(const libcamera::ValueNode ¶ms) override; - void prepare(Metadata *imageMetadata) override; + void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override; void process(StatisticsPtr &stats, Metadata *imageMetadata) override; private: diff --git a/src/ipa/rpi/controller/rpi/awb.cpp b/src/ipa/rpi/controller/rpi/awb.cpp index 1b20d117..41d075d3 100644 --- a/src/ipa/rpi/controller/rpi/awb.cpp +++ b/src/ipa/rpi/controller/rpi/awb.cpp @@ -295,7 +295,8 @@ void Awb::restartAsync(StatisticsPtr &stats, double lux) asyncSignal_.notify_one(); } -void Awb::prepare(Metadata *imageMetadata) +void Awb::prepare(Metadata *imageMetadata, + [[maybe_unused]] const SharedBuffer &bayerBuffer) { if (frameCount_ < (int)config_.startupFrames) frameCount_++; diff --git a/src/ipa/rpi/controller/rpi/awb.h b/src/ipa/rpi/controller/rpi/awb.h index 855a3a7c..ca072362 100644 --- a/src/ipa/rpi/controller/rpi/awb.h +++ b/src/ipa/rpi/controller/rpi/awb.h @@ -77,7 +77,7 @@ public: void enableAuto() override; void disableAuto() override; void switchMode(CameraMode const &cameraMode, Metadata *metadata) override; - void prepare(Metadata *imageMetadata) override; + void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override; void process(StatisticsPtr &stats, Metadata *imageMetadata) override; static double interpolateQuadatric(libcamera::ipa::Pwl::Point const &a, diff --git a/src/ipa/rpi/controller/rpi/black_level.cpp b/src/ipa/rpi/controller/rpi/black_level.cpp index 42ea1505..4fa98100 100644 --- a/src/ipa/rpi/controller/rpi/black_level.cpp +++ b/src/ipa/rpi/controller/rpi/black_level.cpp @@ -52,7 +52,8 @@ void BlackLevel::initialValues(uint16_t &blackLevelR, uint16_t &blackLevelG, blackLevelB = blackLevelB_; } -void BlackLevel::prepare(Metadata *imageMetadata) +void BlackLevel::prepare(Metadata *imageMetadata, + [[maybe_unused]] const SharedBuffer &bayerBuffer) { /* * Possibly we should think about doing this in a switchMode or diff --git a/src/ipa/rpi/controller/rpi/black_level.h b/src/ipa/rpi/controller/rpi/black_level.h index dbf29b28..fe02ef20 100644 --- a/src/ipa/rpi/controller/rpi/black_level.h +++ b/src/ipa/rpi/controller/rpi/black_level.h @@ -21,7 +21,7 @@ public: int read(const libcamera::ValueNode ¶ms) override; void initialValues(uint16_t &blackLevelR, uint16_t &blackLevelG, uint16_t &blackLevelB) override; - void prepare(Metadata *imageMetadata) override; + void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override; private: double blackLevelR_; diff --git a/src/ipa/rpi/controller/rpi/cac.cpp b/src/ipa/rpi/controller/rpi/cac.cpp index ddc848f2..9a69632f 100644 --- a/src/ipa/rpi/controller/rpi/cac.cpp +++ b/src/ipa/rpi/controller/rpi/cac.cpp @@ -93,7 +93,8 @@ int Cac::read(const libcamera::ValueNode ¶ms) return 0; } -void Cac::prepare(Metadata *imageMetadata) +void Cac::prepare(Metadata *imageMetadata, + [[maybe_unused]] const SharedBuffer &bayerBuffer) { if (config_.enabled) imageMetadata->set("cac.status", cacStatus_); diff --git a/src/ipa/rpi/controller/rpi/cac.h b/src/ipa/rpi/controller/rpi/cac.h index 11c47a7c..b6152646 100644 --- a/src/ipa/rpi/controller/rpi/cac.h +++ b/src/ipa/rpi/controller/rpi/cac.h @@ -25,7 +25,7 @@ public: Cac(Controller *controller = NULL); char const *name() const override; int read(const libcamera::ValueNode ¶ms) override; - void prepare(Metadata *imageMetadata) override; + void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override; private: CacConfig config_; diff --git a/src/ipa/rpi/controller/rpi/ccm.cpp b/src/ipa/rpi/controller/rpi/ccm.cpp index d3231182..205fcc9e 100644 --- a/src/ipa/rpi/controller/rpi/ccm.cpp +++ b/src/ipa/rpi/controller/rpi/ccm.cpp @@ -146,7 +146,8 @@ Matrix3x3 applySaturation(Matrix3x3 const &ccm, double saturation) } /* namespace */ -void Ccm::prepare(Metadata *imageMetadata) +void Ccm::prepare(Metadata *imageMetadata, + [[maybe_unused]] const SharedBuffer &bayerBuffer) { bool awbOk = false, luxOk = false; struct AwbStatus awb = {}; diff --git a/src/ipa/rpi/controller/rpi/ccm.h b/src/ipa/rpi/controller/rpi/ccm.h index a0f5b698..db69d53a 100644 --- a/src/ipa/rpi/controller/rpi/ccm.h +++ b/src/ipa/rpi/controller/rpi/ccm.h @@ -36,7 +36,7 @@ public: void setSaturation(double saturation) override; void setCcm(Matrix3x3 const &matrix) override; void initialise() override; - void prepare(Metadata *imageMetadata) override; + void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override; private: CcmConfig config_; diff --git a/src/ipa/rpi/controller/rpi/contrast.cpp b/src/ipa/rpi/controller/rpi/contrast.cpp index 3457e040..da142229 100644 --- a/src/ipa/rpi/controller/rpi/contrast.cpp +++ b/src/ipa/rpi/controller/rpi/contrast.cpp @@ -89,7 +89,8 @@ void Contrast::initialise() status_.gammaCurve = config_.gammaCurve; } -void Contrast::prepare(Metadata *imageMetadata) +void Contrast::prepare(Metadata *imageMetadata, + [[maybe_unused]] const SharedBuffer &bayerBuffer) { imageMetadata->set("contrast.status", status_); } diff --git a/src/ipa/rpi/controller/rpi/contrast.h b/src/ipa/rpi/controller/rpi/contrast.h index 3571626d..18cf4ba0 100644 --- a/src/ipa/rpi/controller/rpi/contrast.h +++ b/src/ipa/rpi/controller/rpi/contrast.h @@ -41,7 +41,7 @@ public: void enableCe(bool enable) override; void restoreCe() override; void initialise() override; - void prepare(Metadata *imageMetadata) override; + void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override; void process(StatisticsPtr &stats, Metadata *imageMetadata) override; private: diff --git a/src/ipa/rpi/controller/rpi/decompand.cpp b/src/ipa/rpi/controller/rpi/decompand.cpp index 185e06f9..7fcb3642 100644 --- a/src/ipa/rpi/controller/rpi/decompand.cpp +++ b/src/ipa/rpi/controller/rpi/decompand.cpp @@ -49,7 +49,8 @@ void Decompand::initialValues(libcamera::ipa::Pwl &decompandCurve) decompandCurve = {}; } -void Decompand::prepare(Metadata *imageMetadata) +void Decompand::prepare(Metadata *imageMetadata, + [[maybe_unused]] const SharedBuffer &bayerBuffer) { DecompandStatus decompandStatus; diff --git a/src/ipa/rpi/controller/rpi/decompand.h b/src/ipa/rpi/controller/rpi/decompand.h index 1a53de24..c6b1204d 100644 --- a/src/ipa/rpi/controller/rpi/decompand.h +++ b/src/ipa/rpi/controller/rpi/decompand.h @@ -22,7 +22,7 @@ public: void initialise() override; void switchMode(CameraMode const &cameraMode, Metadata *metadata) override; void initialValues(libcamera::ipa::Pwl &decompandCurve) override; - void prepare(Metadata *imageMetadata) override; + void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override; private: CameraMode mode_; diff --git a/src/ipa/rpi/controller/rpi/denoise.cpp b/src/ipa/rpi/controller/rpi/denoise.cpp index 0cd0dd53..a2ec4bc8 100644 --- a/src/ipa/rpi/controller/rpi/denoise.cpp +++ b/src/ipa/rpi/controller/rpi/denoise.cpp @@ -122,7 +122,8 @@ void Denoise::switchMode([[maybe_unused]] CameraMode const &cameraMode, currentCdnDeviation_ = currentConfig_->cdnDeviationNoTdn; } -void Denoise::prepare(Metadata *imageMetadata) +void Denoise::prepare(Metadata *imageMetadata, + [[maybe_unused]] const SharedBuffer &bayerBuffer) { struct NoiseStatus noiseStatus = {}; noiseStatus.noiseSlope = 3.0; // in case no metadata diff --git a/src/ipa/rpi/controller/rpi/denoise.h b/src/ipa/rpi/controller/rpi/denoise.h index 499b2ab7..c04f3600 100644 --- a/src/ipa/rpi/controller/rpi/denoise.h +++ b/src/ipa/rpi/controller/rpi/denoise.h @@ -42,7 +42,7 @@ public: int read(const libcamera::ValueNode ¶ms) override; void initialise() override; void switchMode(CameraMode const &cameraMode, Metadata *metadata) override; - void prepare(Metadata *imageMetadata) override; + void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override; void setMode(DenoiseMode mode) override; void setConfig(std::string const &name) override; diff --git a/src/ipa/rpi/controller/rpi/dpc.cpp b/src/ipa/rpi/controller/rpi/dpc.cpp index a9220799..c4e331b8 100644 --- a/src/ipa/rpi/controller/rpi/dpc.cpp +++ b/src/ipa/rpi/controller/rpi/dpc.cpp @@ -42,7 +42,8 @@ int Dpc::read(const libcamera::ValueNode ¶ms) return 0; } -void Dpc::prepare(Metadata *imageMetadata) +void Dpc::prepare(Metadata *imageMetadata, + [[maybe_unused]] const SharedBuffer &bayerBuffer) { DpcStatus dpcStatus = {}; /* Should we vary this with lux level or analogue gain? TBD. */ diff --git a/src/ipa/rpi/controller/rpi/dpc.h b/src/ipa/rpi/controller/rpi/dpc.h index a1a02af5..f0b1150c 100644 --- a/src/ipa/rpi/controller/rpi/dpc.h +++ b/src/ipa/rpi/controller/rpi/dpc.h @@ -23,7 +23,7 @@ public: Dpc(Controller *controller); char const *name() const override; int read(const libcamera::ValueNode ¶ms) override; - void prepare(Metadata *imageMetadata) override; + void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override; private: DpcConfig config_; diff --git a/src/ipa/rpi/controller/rpi/geq.cpp b/src/ipa/rpi/controller/rpi/geq.cpp index 9382a033..a98129aa 100644 --- a/src/ipa/rpi/controller/rpi/geq.cpp +++ b/src/ipa/rpi/controller/rpi/geq.cpp @@ -52,7 +52,8 @@ int Geq::read(const libcamera::ValueNode ¶ms) return 0; } -void Geq::prepare(Metadata *imageMetadata) +void Geq::prepare(Metadata *imageMetadata, + [[maybe_unused]] const SharedBuffer &bayerBuffer) { LuxStatus luxStatus = {}; luxStatus.lux = 400; diff --git a/src/ipa/rpi/controller/rpi/geq.h b/src/ipa/rpi/controller/rpi/geq.h index 4827051b..f7437f82 100644 --- a/src/ipa/rpi/controller/rpi/geq.h +++ b/src/ipa/rpi/controller/rpi/geq.h @@ -27,7 +27,7 @@ public: Geq(Controller *controller); char const *name() const override; int read(const libcamera::ValueNode ¶ms) override; - void prepare(Metadata *imageMetadata) override; + void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override; private: GeqConfig config_; diff --git a/src/ipa/rpi/controller/rpi/hdr.cpp b/src/ipa/rpi/controller/rpi/hdr.cpp index c256f748..bc0e9541 100644 --- a/src/ipa/rpi/controller/rpi/hdr.cpp +++ b/src/ipa/rpi/controller/rpi/hdr.cpp @@ -174,7 +174,8 @@ void Hdr::switchMode([[maybe_unused]] CameraMode const &cameraMode, Metadata *me delayedStatus_ = status_; } -void Hdr::prepare(Metadata *imageMetadata) +void Hdr::prepare(Metadata *imageMetadata, + [[maybe_unused]] const SharedBuffer &bayerBuffer) { AgcStatus agcStatus; if (!imageMetadata->get("agc.delayed_status", agcStatus)) diff --git a/src/ipa/rpi/controller/rpi/hdr.h b/src/ipa/rpi/controller/rpi/hdr.h index 58ff5ba8..eaf4a722 100644 --- a/src/ipa/rpi/controller/rpi/hdr.h +++ b/src/ipa/rpi/controller/rpi/hdr.h @@ -62,7 +62,7 @@ public: char const *name() const override; void switchMode(CameraMode const &cameraMode, Metadata *metadata) override; int read(const libcamera::ValueNode ¶ms) override; - void prepare(Metadata *imageMetadata) override; + void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override; void process(StatisticsPtr &stats, Metadata *imageMetadata) override; int setMode(std::string const &mode) override; std::vector getChannels() const override; diff --git a/src/ipa/rpi/controller/rpi/lux.cpp b/src/ipa/rpi/controller/rpi/lux.cpp index 2c9ca30b..6e547dc3 100644 --- a/src/ipa/rpi/controller/rpi/lux.cpp +++ b/src/ipa/rpi/controller/rpi/lux.cpp @@ -75,7 +75,8 @@ void Lux::switchMode(CameraMode const &cameraMode, [[maybe_unused]] Metadata *me sensitivity_ = cameraMode.sensitivity; } -void Lux::prepare(Metadata *imageMetadata) +void Lux::prepare(Metadata *imageMetadata, + [[maybe_unused]] const SharedBuffer &bayerBuffer) { std::unique_lock lock(mutex_); imageMetadata->set("lux.status", status_); diff --git a/src/ipa/rpi/controller/rpi/lux.h b/src/ipa/rpi/controller/rpi/lux.h index c9ffe38b..c5b3405c 100644 --- a/src/ipa/rpi/controller/rpi/lux.h +++ b/src/ipa/rpi/controller/rpi/lux.h @@ -25,7 +25,7 @@ public: char const *name() const override; int read(const libcamera::ValueNode ¶ms) override; void switchMode(CameraMode const &cameraMode, Metadata *metadata) override; - void prepare(Metadata *imageMetadata) override; + void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override; void process(StatisticsPtr &stats, Metadata *imageMetadata) override; void setCurrentAperture(double aperture); diff --git a/src/ipa/rpi/controller/rpi/noise.cpp b/src/ipa/rpi/controller/rpi/noise.cpp index d6e01c2c..76874435 100644 --- a/src/ipa/rpi/controller/rpi/noise.cpp +++ b/src/ipa/rpi/controller/rpi/noise.cpp @@ -56,7 +56,8 @@ int Noise::read(const libcamera::ValueNode ¶ms) return 0; } -void Noise::prepare(Metadata *imageMetadata) +void Noise::prepare(Metadata *imageMetadata, + [[maybe_unused]] const SharedBuffer &bayerBuffer) { struct DeviceStatus deviceStatus; deviceStatus.analogueGain = 1.0; /* keep compiler calm */ diff --git a/src/ipa/rpi/controller/rpi/noise.h b/src/ipa/rpi/controller/rpi/noise.h index c449fa52..79501330 100644 --- a/src/ipa/rpi/controller/rpi/noise.h +++ b/src/ipa/rpi/controller/rpi/noise.h @@ -20,7 +20,7 @@ public: char const *name() const override; void switchMode(CameraMode const &cameraMode, Metadata *metadata) override; int read(const libcamera::ValueNode ¶ms) override; - void prepare(Metadata *imageMetadata) override; + void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override; private: /* the noise profile for analogue gain of 1.0 */ diff --git a/src/ipa/rpi/controller/rpi/saturation.cpp b/src/ipa/rpi/controller/rpi/saturation.cpp index 5001f930..da92ee5d 100644 --- a/src/ipa/rpi/controller/rpi/saturation.cpp +++ b/src/ipa/rpi/controller/rpi/saturation.cpp @@ -39,7 +39,8 @@ void Saturation::initialise() { } -void Saturation::prepare(Metadata *imageMetadata) +void Saturation::prepare(Metadata *imageMetadata, + [[maybe_unused]] const SharedBuffer &bayerBuffer) { SaturationStatus saturation; diff --git a/src/ipa/rpi/controller/rpi/saturation.h b/src/ipa/rpi/controller/rpi/saturation.h index e6a22c8b..c6864687 100644 --- a/src/ipa/rpi/controller/rpi/saturation.h +++ b/src/ipa/rpi/controller/rpi/saturation.h @@ -23,7 +23,7 @@ public: char const *name() const override; int read(const libcamera::ValueNode ¶ms) override; void initialise() override; - void prepare(Metadata *imageMetadata) override; + void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override; private: SaturationConfig config_; diff --git a/src/ipa/rpi/controller/rpi/sdn.cpp b/src/ipa/rpi/controller/rpi/sdn.cpp index 13dfad02..e2897796 100644 --- a/src/ipa/rpi/controller/rpi/sdn.cpp +++ b/src/ipa/rpi/controller/rpi/sdn.cpp @@ -46,7 +46,8 @@ void Sdn::initialise() { } -void Sdn::prepare(Metadata *imageMetadata) +void Sdn::prepare(Metadata *imageMetadata, + [[maybe_unused]] const SharedBuffer &bayerBuffer) { struct NoiseStatus noiseStatus = {}; noiseStatus.noiseSlope = 3.0; /* in case no metadata */ diff --git a/src/ipa/rpi/controller/rpi/sdn.h b/src/ipa/rpi/controller/rpi/sdn.h index 20d847f0..b6abeb10 100644 --- a/src/ipa/rpi/controller/rpi/sdn.h +++ b/src/ipa/rpi/controller/rpi/sdn.h @@ -20,7 +20,7 @@ public: char const *name() const override; int read(const libcamera::ValueNode ¶ms) override; void initialise() override; - void prepare(Metadata *imageMetadata) override; + void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override; void setMode(DenoiseMode mode) override; private: diff --git a/src/ipa/rpi/controller/rpi/sharpen.cpp b/src/ipa/rpi/controller/rpi/sharpen.cpp index e8723916..118fa3a9 100644 --- a/src/ipa/rpi/controller/rpi/sharpen.cpp +++ b/src/ipa/rpi/controller/rpi/sharpen.cpp @@ -61,7 +61,8 @@ void Sharpen::setStrength(double strength) userStrength_ = std::max(0.0, strength); } -void Sharpen::prepare(Metadata *imageMetadata) +void Sharpen::prepare(Metadata *imageMetadata, + [[maybe_unused]] const SharedBuffer &bayerBuffer) { /* * The userStrength_ affects the algorithm's internal gain directly, but diff --git a/src/ipa/rpi/controller/rpi/sharpen.h b/src/ipa/rpi/controller/rpi/sharpen.h index 2814ec85..24c6c41d 100644 --- a/src/ipa/rpi/controller/rpi/sharpen.h +++ b/src/ipa/rpi/controller/rpi/sharpen.h @@ -21,7 +21,7 @@ public: void switchMode(CameraMode const &cameraMode, Metadata *metadata) override; int read(const libcamera::ValueNode ¶ms) override; void setStrength(double strength) override; - void prepare(Metadata *imageMetadata) override; + void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override; private: double threshold_; diff --git a/src/ipa/rpi/controller/rpi/tonemap.cpp b/src/ipa/rpi/controller/rpi/tonemap.cpp index 3cbecf53..187107fc 100644 --- a/src/ipa/rpi/controller/rpi/tonemap.cpp +++ b/src/ipa/rpi/controller/rpi/tonemap.cpp @@ -41,7 +41,8 @@ void Tonemap::initialise() { } -void Tonemap::prepare(Metadata *imageMetadata) +void Tonemap::prepare(Metadata *imageMetadata, + [[maybe_unused]] const SharedBuffer &bayerBuffer) { TonemapStatus tonemapStatus; diff --git a/src/ipa/rpi/controller/rpi/tonemap.h b/src/ipa/rpi/controller/rpi/tonemap.h index 4d486d13..3fcab8c5 100644 --- a/src/ipa/rpi/controller/rpi/tonemap.h +++ b/src/ipa/rpi/controller/rpi/tonemap.h @@ -27,7 +27,7 @@ public: char const *name() const override; int read(const libcamera::ValueNode ¶ms) override; void initialise() override; - void prepare(Metadata *imageMetadata) override; + void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override; private: TonemapConfig config_;