{"id":25609,"url":"https://patchwork.libcamera.org/api/patches/25609/?format=json","web_url":"https://patchwork.libcamera.org/patch/25609/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20251218232220.761254-4-rui.wang@ideasonboard.com>","date":"2025-12-18T23:22:17","name":"[v6,3/6] ipa: rkisp1: algorithms: dpf: Refactor prepare() into helpers","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"eb377342bf7c78f897119fb2328a19b838bf365b","submitter":{"id":241,"url":"https://patchwork.libcamera.org/api/people/241/?format=json","name":"Rui Wang","email":"rui.wang@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/25609/mbox/","series":[{"id":5673,"url":"https://patchwork.libcamera.org/api/series/5673/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5673","date":"2025-12-18T23:22:14","name":"refactor DPF parsing and initialization","version":6,"mbox":"https://patchwork.libcamera.org/series/5673/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/25609/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/25609/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 368F7C3274\n\tfor ;\n\tThu, 18 Dec 2025 23:22:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5567261F69;\n\tFri, 19 Dec 2025 00:22:51 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C0AA561F5A\n\tfor ;\n\tFri, 19 Dec 2025 00:22:49 +0100 (CET)","from rui-Precision-7560.local (unknown [209.216.103.65])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0831B596;\n\tFri, 19 Dec 2025 00:22:41 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"HHs6MDKU\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1766100162;\n\tbh=A3Q1Q6TRRIbZYCCJ33cq9YqfgEixJmLfGCn/DQjxj20=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=HHs6MDKUGZrqKnC4TCD2KfVXDgZSKxTAxwhaWVPruCQmrESPf7AKoe5PuJAfVXd7v\n\tJtS0c4f7RNKQ9SfSmAn0CZhZYVqg1hyoJzLWKabav9qbTQP6bi4h4TMlIi0n3xERjw\n\tO6OagHrEuNii4mXcLA8QLQmvdozx+rRx9aIiN/qI=","From":"Rui Wang ","To":"libcamera-devel@lists.libcamera.org","Cc":"Rui Wang ","Subject":"[PATCH v6 3/6] ipa: rkisp1: algorithms: dpf: Refactor prepare() into\n\thelpers","Date":"Thu, 18 Dec 2025 18:22:17 -0500","Message-ID":"<20251218232220.761254-4-rui.wang@ideasonboard.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20251218232220.761254-1-rui.wang@ideasonboard.com>","References":"<20251218232220.761254-1-rui.wang@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Split the prepare() function into prepareDisabledMode() and\nprepareEnabledMode() to improve readability and maintainability.\n\nThis separates the logic for disabling and enabling the DPF, making\nthe main prepare() function cleaner and easier to follow.\n\nSigned-off-by: Rui Wang \n---\nchangelog since v5: Nothing changed\n\n Reviewed-by tags from v5 are carried over (no code changes).\n\n src/ipa/rkisp1/algorithms/dpf.cpp | 80 ++++++++++++++++++++-----------\n src/ipa/rkisp1/algorithms/dpf.h | 7 +++\n 2 files changed, 58 insertions(+), 29 deletions(-)","diff":"diff --git a/src/ipa/rkisp1/algorithms/dpf.cpp b/src/ipa/rkisp1/algorithms/dpf.cpp\nindex 7be30677..ee82dfd2 100644\n--- a/src/ipa/rkisp1/algorithms/dpf.cpp\n+++ b/src/ipa/rkisp1/algorithms/dpf.cpp\n@@ -320,38 +320,60 @@ void Dpf::prepare(IPAContext &context, const uint32_t frame,\n \tif (!frameContext.dpf.update && frame > 0)\n \t\treturn;\n \n+\tif (!frameContext.dpf.denoise) {\n+\t\tprepareDisabledMode(context, frame, frameContext, params);\n+\t\treturn;\n+\t}\n+\n+\tprepareEnabledMode(context, frame, frameContext, params);\n+}\n+\n+void Dpf::prepareDisabledMode([[maybe_unused]] IPAContext &context,\n+\t\t\t [[maybe_unused]] const uint32_t frame,\n+\t\t\t [[maybe_unused]] IPAFrameContext &frameContext,\n+\t\t\t RkISP1Params *params)\n+{\n+\tauto dpfConfig = params->block();\n+\tdpfConfig.setEnabled(false);\n+\tauto dpfStrength = params->block();\n+\tdpfStrength.setEnabled(false);\n+}\n+\n+void Dpf::prepareEnabledMode(IPAContext &context, [[maybe_unused]] const uint32_t frame,\n+\t\t\t [[maybe_unused]] IPAFrameContext &frameContext,\n+\t\t\t RkISP1Params *params)\n+{\n \tauto config = params->block();\n-\tconfig.setEnabled(frameContext.dpf.denoise);\n+\tconfig.setEnabled(true);\n+\t*config = config_;\n+\n+\tconst auto &awb = context.configuration.awb;\n+\tconst auto &lsc = context.configuration.lsc;\n+\n+\tauto &mode = config->gain.mode;\n+\n+\t/*\n+\t * The DPF needs to take into account the total amount of\n+\t * digital gain, which comes from the AWB and LSC modules. The\n+\t * DPF hardware can be programmed with a digital gain value\n+\t * manually, but can also use the gains supplied by the AWB and\n+\t * LSC modules automatically when they are enabled. Use that\n+\t * mode of operation as it simplifies control of the DPF.\n+\t */\n+\tif (awb.enabled && lsc.enabled)\n+\t\tmode = RKISP1_CIF_ISP_DPF_GAIN_USAGE_AWB_LSC_GAINS;\n+\telse if (awb.enabled)\n+\t\tmode = RKISP1_CIF_ISP_DPF_GAIN_USAGE_AWB_GAINS;\n+\telse if (lsc.enabled)\n+\t\tmode = RKISP1_CIF_ISP_DPF_GAIN_USAGE_LSC_GAINS;\n+\telse\n+\t\tmode = RKISP1_CIF_ISP_DPF_GAIN_USAGE_DISABLED;\n+\n+\tconfig_.gain.mode = mode;\n \n \tauto strengthConfig = params->block();\n-\tstrengthConfig.setEnabled(frameContext.dpf.denoise);\n-\n-\tif (frameContext.dpf.denoise) {\n-\t\t*config = config_;\n-\t\t*strengthConfig = strengthConfig_;\n-\n-\t\tconst auto &awb = context.configuration.awb;\n-\t\tconst auto &lsc = context.configuration.lsc;\n-\n-\t\tauto &mode = config->gain.mode;\n-\n-\t\t/*\n-\t\t * The DPF needs to take into account the total amount of\n-\t\t * digital gain, which comes from the AWB and LSC modules. The\n-\t\t * DPF hardware can be programmed with a digital gain value\n-\t\t * manually, but can also use the gains supplied by the AWB and\n-\t\t * LSC modules automatically when they are enabled. Use that\n-\t\t * mode of operation as it simplifies control of the DPF.\n-\t\t */\n-\t\tif (awb.enabled && lsc.enabled)\n-\t\t\tmode = RKISP1_CIF_ISP_DPF_GAIN_USAGE_AWB_LSC_GAINS;\n-\t\telse if (awb.enabled)\n-\t\t\tmode = RKISP1_CIF_ISP_DPF_GAIN_USAGE_AWB_GAINS;\n-\t\telse if (lsc.enabled)\n-\t\t\tmode = RKISP1_CIF_ISP_DPF_GAIN_USAGE_LSC_GAINS;\n-\t\telse\n-\t\t\tmode = RKISP1_CIF_ISP_DPF_GAIN_USAGE_DISABLED;\n-\t}\n+\tstrengthConfig.setEnabled(true);\n+\t*strengthConfig = strengthConfig_;\n }\n \n REGISTER_IPA_ALGORITHM(Dpf, \"Dpf\")\ndiff --git a/src/ipa/rkisp1/algorithms/dpf.h b/src/ipa/rkisp1/algorithms/dpf.h\nindex 2a2c7052..fcf121cb 100644\n--- a/src/ipa/rkisp1/algorithms/dpf.h\n+++ b/src/ipa/rkisp1/algorithms/dpf.h\n@@ -44,6 +44,13 @@ private:\n \n \tbool loadReductionConfig(int32_t mode);\n \n+\tvoid prepareDisabledMode(IPAContext &context, const uint32_t frame,\n+\t\t\t\t IPAFrameContext &frameContext,\n+\t\t\t\t RkISP1Params *params);\n+\tvoid prepareEnabledMode(IPAContext &context, const uint32_t frame,\n+\t\t\t\tIPAFrameContext &frameContext,\n+\t\t\t\tRkISP1Params *params);\n+\n \tstruct rkisp1_cif_isp_dpf_config config_;\n \tstruct rkisp1_cif_isp_dpf_strength_config strengthConfig_;\n \tstd::vector noiseReductionModes_;\n","prefixes":["v6","3/6"]}