{"id":26067,"url":"https://patchwork.libcamera.org/api/patches/26067/?format=json","web_url":"https://patchwork.libcamera.org/patch/26067/","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":"<20260201191607.2740223-5-rui.wang@ideasonboard.com>","date":"2026-02-01T19:16:04","name":"[v12,4/7] ipa: rkisp1: algorithms: dpf: Refactor prepare() into helpers","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"875fd487968db4b7f734d83cebc8293f99180ead","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/26067/mbox/","series":[{"id":5764,"url":"https://patchwork.libcamera.org/api/series/5764/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5764","date":"2026-02-01T19:16:00","name":"refactor DPF parsing and initialization","version":12,"mbox":"https://patchwork.libcamera.org/series/5764/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/26067/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/26067/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 2EE09BD78E\n\tfor ;\n\tSun, 1 Feb 2026 19:16:31 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E201261FF5;\n\tSun, 1 Feb 2026 20:16:30 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0FA3C61FE7\n\tfor ;\n\tSun, 1 Feb 2026 20:16:27 +0100 (CET)","from rui-Precision-7560.tail5b760b.ts.net (unknown\n\t[209.216.103.65])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 5119F492;\n\tSun, 1 Feb 2026 20:15:46 +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=\"I9iZtE/z\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1769973347;\n\tbh=pbD7xgbEP5lHAekw8fVdNMqXKlq6uNfOrib8JDVqvhY=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=I9iZtE/zGw2hTML/+lBq7PM3jXP8HmhtCGIWfuNUjcPfhf/eh23KGVp1itsUXQCAi\n\tUR9Ic2sKlReshNwy21E1QYxJd7V6HiER5TNkCarPdVhe13dcQIDlSN2XsOlmxNDePa\n\t7OyrL84G4PV/4b7FZhKvRgwQj7tTCxf7vEukEDbo=","From":"Rui Wang ","To":"libcamera-devel@lists.libcamera.org","Cc":"Rui Wang ,\n\tJacopo Mondi ,\n\tIsaac Scott ","Subject":"[PATCH v12 4/7] ipa: rkisp1: algorithms: dpf: Refactor prepare()\n\tinto helpers","Date":"Sun, 1 Feb 2026 14:16:04 -0500","Message-ID":"<20260201191607.2740223-5-rui.wang@ideasonboard.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20260201191607.2740223-1-rui.wang@ideasonboard.com>","References":"<20260201191607.2740223-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 \nReviewed-by: Jacopo Mondi \nReviewed-by: Isaac Scott \n\n---\nchangelog since v5/v6: Nothing changed\n\nchangelog since v8 :\n - remove [[maybe_unused] for prepareEnable and prepareDisable\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 | 3 ++\n 2 files changed, 52 insertions(+), 31 deletions(-)","diff":"diff --git a/src/ipa/rkisp1/algorithms/dpf.cpp b/src/ipa/rkisp1/algorithms/dpf.cpp\nindex 303d5cab..0d3a9f0e 100644\n--- a/src/ipa/rkisp1/algorithms/dpf.cpp\n+++ b/src/ipa/rkisp1/algorithms/dpf.cpp\n@@ -337,40 +337,58 @@ 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(params);\n+\t\treturn;\n+\t}\n+\n+\tprepareEnabledMode(context, params);\n+}\n+\n+void Dpf::prepareDisabledMode(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, RkISP1Params *params)\n+{\n+\tif (activeMode_ == noiseReductionModes_.end())\n+\t\treturn;\n+\n+\tconst ModeConfig &modeConfig = *activeMode_;\n+\n \tauto config = params->block();\n-\tconfig.setEnabled(frameContext.dpf.denoise);\n+\tconfig.setEnabled(true);\n+\t*config = modeConfig.dpf;\n+\n+\tconst auto &awb = context.configuration.awb;\n+\tconst auto &lsc = context.activeState.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 \tauto strengthConfig = params->block();\n-\tstrengthConfig.setEnabled(frameContext.dpf.denoise);\n-\n-\tif (frameContext.dpf.denoise) {\n-\t\tconst ModeConfig &modeConfig = *activeMode_;\n-\n-\t\t*config = modeConfig.dpf;\n-\t\t*strengthConfig = modeConfig.strength;\n-\n-\t\tconst auto &awb = context.configuration.awb;\n-\t\tconst auto &lsc = context.activeState.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 = modeConfig.strength;\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 43effcbe..208d8fe9 100644\n--- a/src/ipa/rkisp1/algorithms/dpf.h\n+++ b/src/ipa/rkisp1/algorithms/dpf.h\n@@ -44,6 +44,9 @@ private:\n \n \tbool loadConfig(int32_t mode);\n \n+\tvoid prepareDisabledMode(RkISP1Params *params);\n+\tvoid prepareEnabledMode(IPAContext &context, RkISP1Params *params);\n+\n \tstd::vector noiseReductionModes_;\n \tstd::vector::const_iterator activeMode_;\n };\n","prefixes":["v12","4/7"]}