From patchwork Tue Nov 25 00:08:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Wang X-Patchwork-Id: 25178 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 3B184C32EF for ; Tue, 25 Nov 2025 00:09:25 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D02A060AA9; Tue, 25 Nov 2025 01:09:24 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="roEgZwme"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CE4A560AB2 for ; Tue, 25 Nov 2025 01:09:21 +0100 (CET) Received: from rui-Precision-7560.local (unknown [IPv6:2607:fea8:935b:7220:cb34:a7b8:53d:5466]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id C63DE17EB; Tue, 25 Nov 2025 01:07:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1764029233; bh=ovL0wjZY8E6+vr8e/kGetsg/IUbZrJMEp1uOplzTMHM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=roEgZwmeb4uCvm1e6CPymU5T45KGPUhRPD0RWJrKKVa8VtL/oFfpkYH/7RzLLTDE0 igrJWzjzdx2hcuJhiK9+te7nwKWbMvEk4V4g0dpVDjIkvY/kxOB14KwEOd2VLfn6eN bsUwD5wlirGlr/YOXiMglaIpsZszpznd7G++MgcY= From: Rui Wang To: libcamera-devel@lists.libcamera.org Cc: Rui Wang Subject: [PATCH v1 11/11] ipa: rkisp1: algorithms: dpf: publish DPF metadata Date: Mon, 24 Nov 2025 19:08:48 -0500 Message-ID: <20251125000848.4103786-12-rui.wang@ideasonboard.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251125000848.4103786-1-rui.wang@ideasonboard.com> References: <20251125000848.4103786-1-rui.wang@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" Implement process() and fillMetadata() to publish DPF status and current configuration values in frame metadata. This allows applications to read back the active DPF settings. Metadata published every frame: - DpfExposeIndex: Current index value computed from AGC gains - DpfMode: Current mode (auto/manual) - DpfChannelStrengths: Active R/G/B strength values Developer mode metadata (when enabled): - DpfGreenSpatialCoefficients: Green spatial filter coefficients - DpfRedBlueSpatialCoefficients: RB spatial filter coefficients - DpfRbFilterSize: RB filter size (9x9 or 13x9) - DpfNoiseLevelLookupCoefficients: NLL coefficients - DpfNoiseLevelLookupScaleMode: NLL scale mode (linear/log) Signed-off-by: Rui Wang --- src/ipa/rkisp1/algorithms/denoise.h | 16 +++++++++ src/ipa/rkisp1/algorithms/dpf.cpp | 56 +++++++++++++++++++++++++++++ src/ipa/rkisp1/algorithms/dpf.h | 7 ++++ 3 files changed, 79 insertions(+) diff --git a/src/ipa/rkisp1/algorithms/denoise.h b/src/ipa/rkisp1/algorithms/denoise.h index c532b7eb..a54e3c43 100644 --- a/src/ipa/rkisp1/algorithms/denoise.h +++ b/src/ipa/rkisp1/algorithms/denoise.h @@ -71,6 +71,10 @@ protected: { } virtual ControlInfoMap::Map getControlMap() const; + virtual void fillMetadata(IPAContext &context, + IPAFrameContext &frameContext, + ControlList &metadata); + private: /**< Developer mode state for advanced controls */ bool devMode_ = false; @@ -108,6 +112,18 @@ inline ControlInfoMap::Map DenoiseBaseAlgorithm::getControlMap() const map[&controls::rkisp1::ExposureGainIndex] = ControlInfo(0, 6400, 0); return map; } + +inline void DenoiseBaseAlgorithm::fillMetadata(IPAContext &context, + IPAFrameContext &frameContext, + ControlList &metadata) +{ + uint32_t exposureIndex = computeExposureIndex(context, frameContext); + metadata.set(controls::rkisp1::ExposureGainIndex, static_cast(exposureIndex)); + + auto currentMode = getRunningMode(); + metadata.set(controls::rkisp1::DenoiseMode, currentMode); +} + } /* namespace ipa::rkisp1::algorithms */ } /* namespace libcamera */ diff --git a/src/ipa/rkisp1/algorithms/dpf.cpp b/src/ipa/rkisp1/algorithms/dpf.cpp index a3a8e789..b3880d41 100644 --- a/src/ipa/rkisp1/algorithms/dpf.cpp +++ b/src/ipa/rkisp1/algorithms/dpf.cpp @@ -911,6 +911,62 @@ void Dpf::prepareDisabledMode([[maybe_unused]] IPAContext &context, str.setEnabled(false); } +/** + * \copydoc libcamera::ipa::Algorithm::process + */ +void Dpf::process(IPAContext &context, const uint32_t frame [[maybe_unused]], + IPAFrameContext &frameContext, + const rkisp1_stat_buffer *stats [[maybe_unused]], + ControlList &metadata) +{ + fillMetadata(context, frameContext, metadata); +} + +void Dpf::fillMetadata(IPAContext &context, + IPAFrameContext &frameContext, + ControlList &metadata) +{ + DenoiseBaseAlgorithm::fillMetadata(context, frameContext, metadata); + /* Strength (R,G,B) - always available */ + int32_t strength[3] = { (int32_t)strengthConfig_.r, + (int32_t)strengthConfig_.g, + (int32_t)strengthConfig_.b }; + metadata.set(controls::rkisp1::DpfChannelStrengths, + Span(strength)); + + if (!isDevMode()) + return; + + /* Advanced controls only in devmode */ + /* Spatial kernels */ + int32_t gCoeffs[RKISP1_CIF_ISP_DPF_MAX_SPATIAL_COEFFS]; + int32_t rbCoeffs[RKISP1_CIF_ISP_DPF_MAX_SPATIAL_COEFFS]; + for (uint32_t i = 0; i < RKISP1_CIF_ISP_DPF_MAX_SPATIAL_COEFFS; ++i) { + gCoeffs[i] = config_.g_flt.spatial_coeff[i]; + rbCoeffs[i] = config_.rb_flt.spatial_coeff[i]; + } + metadata.set(controls::rkisp1::DpfGreenSpatialCoefficients, + Span(gCoeffs)); + metadata.set(controls::rkisp1::DpfRedBlueSpatialCoefficients, + Span(rbCoeffs)); + + /* RB filter size (0=9x9,1=13x9) */ + int32_t fltSize = (config_.rb_flt.fltsize == RKISP1_CIF_ISP_DPF_RB_FILTERSIZE_13x9) ? 1 : 0; + metadata.set(controls::rkisp1::DpfRbFilterSize, fltSize); + + /* NLL coefficients and scale */ + int32_t nll[RKISP1_CIF_ISP_DPF_MAX_NLF_COEFFS]; + for (uint32_t i = 0; i < RKISP1_CIF_ISP_DPF_MAX_NLF_COEFFS; ++i) + nll[i] = config_.nll.coeff[i]; + metadata.set(controls::rkisp1::DpfNoiseLevelLookupCoefficients, + Span(nll)); + int32_t scaleMode = (config_.nll.scale_mode == RKISP1_CIF_ISP_NLL_SCALE_LOGARITHMIC) ? 1 : 0; + metadata.set(controls::rkisp1::DpfNoiseLevelLookupScaleMode, scaleMode); +} + REGISTER_IPA_ALGORITHM(Dpf, "Dpf") } /* namespace ipa::rkisp1::algorithms */ diff --git a/src/ipa/rkisp1/algorithms/dpf.h b/src/ipa/rkisp1/algorithms/dpf.h index e62882f2..64b80556 100644 --- a/src/ipa/rkisp1/algorithms/dpf.h +++ b/src/ipa/rkisp1/algorithms/dpf.h @@ -29,6 +29,10 @@ public: void prepare(IPAContext &context, const uint32_t frame, IPAFrameContext &frameContext, RkISP1Params *params) override; + void process(IPAContext &context, const uint32_t frame [[maybe_unused]], + IPAFrameContext &frameContext, + const rkisp1_stat_buffer *stats [[maybe_unused]], + ControlList &metadata) override; private: struct rkisp1_cif_isp_dpf_config config_; @@ -103,6 +107,9 @@ private: void prepareEnabledMode(IPAContext &context, const uint32_t frame, IPAFrameContext &frameContext, RkISP1Params *params) override; ControlInfoMap::Map getControlMap() const override; + void fillMetadata(IPAContext &context, + IPAFrameContext &frameContext, + ControlList &metadata) override; }; } /* namespace ipa::rkisp1::algorithms */