From patchwork Tue Nov 25 00:08:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Wang X-Patchwork-Id: 25177 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 354E8C3257 for ; Tue, 25 Nov 2025 00:09:24 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C177660AAF; Tue, 25 Nov 2025 01:09:23 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="F+3PjRHh"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0A92160AB3 for ; Tue, 25 Nov 2025 01:09:20 +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 3B0E317EB; Tue, 25 Nov 2025 01:07:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1764029231; bh=cUkuco0HyARjPcIJhprL+7A1ioaxF2RRM0C2yQDtPxE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F+3PjRHh7OcM+nVUvo7WP3CM1jckwLLvIkz8hC4RjcufXdZrHLO5LKVCA8a+0tumX 7WIDhMEfb2IrUzaNRIfrYzMaoVnl4wJgbQdRYr4Dg8G62epGoANrS1c7OlTvpzdJFF vAHB/zRM7yFYqpy/zYiNd1dFHd3XY4rQAxJlJk4U= From: Rui Wang To: libcamera-devel@lists.libcamera.org Cc: Rui Wang Subject: [PATCH v1 10/11] ipa: rkisp1: algorithms: dpf: expose DPF control map Date: Mon, 24 Nov 2025 19:08:47 -0500 Message-ID: <20251125000848.4103786-11-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 getControlMap() to provide the RkISP1 DPF controls with tuning- derived defaults. The map includes: - DpfMode (auto/manual/disable/reduction mode selection) - DpfChannelStrengths (R/G/B strength values) - Developer mode controls when enabled: - Spatial coefficients (green and RB) - RB filter size (9x9 or 13x9) - NLL coefficients and scale mode - DpfExposure (read-only exposure indicator) This control map is registered during init() to expose DPF controls to applications. Signed-off-by: Rui Wang --- src/ipa/rkisp1/algorithms/denoise.h | 9 +++++ src/ipa/rkisp1/algorithms/dpf.cpp | 63 +++++++++++++++++++++++++++++ src/ipa/rkisp1/algorithms/dpf.h | 1 + 3 files changed, 73 insertions(+) diff --git a/src/ipa/rkisp1/algorithms/denoise.h b/src/ipa/rkisp1/algorithms/denoise.h index f07c14fe..c532b7eb 100644 --- a/src/ipa/rkisp1/algorithms/denoise.h +++ b/src/ipa/rkisp1/algorithms/denoise.h @@ -70,6 +70,7 @@ protected: [[maybe_unused]] RkISP1Params *params) { } + virtual ControlInfoMap::Map getControlMap() const; private: /**< Developer mode state for advanced controls */ bool devMode_ = false; @@ -99,6 +100,14 @@ uint32_t DenoiseBaseAlgorithm::selectExposureIndexBand(unsigned exposureIndex, return idx; } +inline ControlInfoMap::Map DenoiseBaseAlgorithm::getControlMap() const +{ + ControlInfoMap::Map map; + map[&controls::rkisp1::DenoiseMode] = + ControlInfo(controls::rkisp1::DenoiseModeValues); + map[&controls::rkisp1::ExposureGainIndex] = ControlInfo(0, 6400, 0); + return map; +} } /* namespace ipa::rkisp1::algorithms */ } /* namespace libcamera */ diff --git a/src/ipa/rkisp1/algorithms/dpf.cpp b/src/ipa/rkisp1/algorithms/dpf.cpp index e3293241..a3a8e789 100644 --- a/src/ipa/rkisp1/algorithms/dpf.cpp +++ b/src/ipa/rkisp1/algorithms/dpf.cpp @@ -84,6 +84,9 @@ int Dpf::init([[maybe_unused]] IPAContext &context, << " mode(s) from tuning"; } + /* Init controls value from YAML */ + auto dpfMap = getControlMap(); + context.ctrlMap.insert(dpfMap.begin(), dpfMap.end()); return 0; } @@ -690,6 +693,66 @@ void Dpf::logConfigIfChanged(uint32_t exposureGainIndex, haveLast = true; } +ControlInfoMap::Map Dpf::getControlMap() const +{ + ControlInfoMap::Map map = DenoiseBaseAlgorithm::getControlMap(); + + std::array strengthDefault = { + static_cast(baseStrengthConfig_.r), + static_cast(baseStrengthConfig_.g), + static_cast(baseStrengthConfig_.b), + }; + map[&controls::rkisp1::DpfChannelStrengths] = + ControlInfo(0, 255, Span(strengthDefault)); + + if (!isDevMode()) + return map; + + const auto copyCoefficients = [](const auto &src, auto &dest) { + for (size_t i = 0; i < dest.size(); ++i) + dest[i] = static_cast(src[i]); + }; + + std::array greenCoeffs{}; + copyCoefficients(baseConfig_.g_flt.spatial_coeff, greenCoeffs); + map[&controls::rkisp1::DpfGreenSpatialCoefficients] = + ControlInfo(0, 63, + Span(greenCoeffs)); + + std::array rbCoeffs{}; + copyCoefficients(baseConfig_.rb_flt.spatial_coeff, rbCoeffs); + map[&controls::rkisp1::DpfRedBlueSpatialCoefficients] = + ControlInfo(0, 63, + Span(rbCoeffs)); + + int32_t rbSizeDefault = baseConfig_.rb_flt.fltsize == + RKISP1_CIF_ISP_DPF_RB_FILTERSIZE_13x9 + ? 1 + : 0; + map[&controls::rkisp1::DpfRbFilterSize] = + ControlInfo(controls::rkisp1::DpfRbFilterSizeValues, + ControlValue(rbSizeDefault)); + + std::array nllCoeffs{}; + copyCoefficients(baseConfig_.nll.coeff, nllCoeffs); + map[&controls::rkisp1::DpfNoiseLevelLookupCoefficients] = + ControlInfo(0, 1023, + Span(nllCoeffs)); + + int32_t scaleModeDefault = baseConfig_.nll.scale_mode == + RKISP1_CIF_ISP_NLL_SCALE_LOGARITHMIC + ? 1 + : 0; + map[&controls::rkisp1::DpfNoiseLevelLookupScaleMode] = + ControlInfo(controls::rkisp1::DpfNoiseLevelLookupScaleModeValues, + ControlValue(scaleModeDefault)); + + return map; +} + /** * \copydoc libcamera::ipa::Algorithm::queueRequest */ diff --git a/src/ipa/rkisp1/algorithms/dpf.h b/src/ipa/rkisp1/algorithms/dpf.h index 86085cf9..e62882f2 100644 --- a/src/ipa/rkisp1/algorithms/dpf.h +++ b/src/ipa/rkisp1/algorithms/dpf.h @@ -102,6 +102,7 @@ private: RkISP1Params *params) override; void prepareEnabledMode(IPAContext &context, const uint32_t frame, IPAFrameContext &frameContext, RkISP1Params *params) override; + ControlInfoMap::Map getControlMap() const override; }; } /* namespace ipa::rkisp1::algorithms */