[{"id":37313,"web_url":"https://patchwork.libcamera.org/comment/37313/","msgid":"","date":"2025-12-11T15:46:09","subject":"Re: [PATCH v4 3/7] ipa: rkisp1: algorithms: dpf: Refactor prepare()\n\tinto helpers","submitter":{"id":143,"url":"https://patchwork.libcamera.org/api/people/143/","name":"Jacopo Mondi","email":"jacopo.mondi@ideasonboard.com"},"content":"Hi Rui\n\nOn Sun, Dec 07, 2025 at 07:48:04PM -0500, Rui Wang wrote:\n> Split the prepare() function into prepareDisabledMode() and\n> prepareEnabledMode() to improve readability and maintainability.\n>\n> This separates the logic for disabling and enabling the DPF, making\n> the main prepare() function cleaner and easier to follow.\n>\n> Signed-off-by: Rui Wang \n> ---\n> changelog:\n> - Move V3 prepareEnabledMode/prepareDisabledMode into this patch\n>\n> src/ipa/rkisp1/algorithms/dpf.cpp | 82 ++++++++++++++++++++-----------\n> src/ipa/rkisp1/algorithms/dpf.h | 9 ++++\n> 2 files changed, 62 insertions(+), 29 deletions(-)\n>\n> diff --git a/src/ipa/rkisp1/algorithms/dpf.cpp b/src/ipa/rkisp1/algorithms/dpf.cpp\n> index 18f2a158..edb4c2bf 100644\n> --- a/src/ipa/rkisp1/algorithms/dpf.cpp\n> +++ b/src/ipa/rkisp1/algorithms/dpf.cpp\n> @@ -320,38 +320,62 @@ 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> +\tframeContext.dpf.denoise = false;\n\nIf you get here, frameContext.dpf.denoise was false already\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,\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 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\nAdd an empty line here\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> +\n\nAnd drop this one\n\n> +\t*strengthConfig = strengthConfig_;\n> }\n>\n> REGISTER_IPA_ALGORITHM(Dpf, \"Dpf\")\n> diff --git a/src/ipa/rkisp1/algorithms/dpf.h b/src/ipa/rkisp1/algorithms/dpf.h\n> index 30cbaa57..99cdbdd3 100644\n> --- a/src/ipa/rkisp1/algorithms/dpf.h\n> +++ b/src/ipa/rkisp1/algorithms/dpf.h\n> @@ -44,6 +44,15 @@ private:\n>\n> \tbool loadReductionConfig(int32_t mode);\n>\n> +\tvoid prepareDisabledMode(IPAContext &context,\n> +\t\t\t\t const uint32_t frame,\n> +\t\t\t\t IPAFrameContext &frameContext,\n> +\t\t\t\t RkISP1Params *params);\n> +\tvoid prepareEnabledMode(IPAContext &context,\n> +\t\t\t\tconst uint32_t frame,\n> +\t\t\t\tIPAFrameContext &frameContext,\n> +\t\t\t\tRkISP1Params *params);\n> +\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\nnits apart\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> \tstruct rkisp1_cif_isp_dpf_config config_;\n> \tstruct rkisp1_cif_isp_dpf_strength_config strengthConfig_;\n> \tstd::vector noiseReductionModes_;\n> --\n> 2.43.0\n>","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 79657C3257\n\tfor ;\n\tThu, 11 Dec 2025 15:46:15 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C005D6160B;\n\tThu, 11 Dec 2025 16:46:14 +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 C78AA61603\n\tfor ;\n\tThu, 11 Dec 2025 16:46:13 +0100 (CET)","from ideasonboard.com (93-46-82-201.ip106.fastwebnet.it\n\t[93.46.82.201])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3DC641352;\n\tThu, 11 Dec 2025 16:46:11 +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=\"U1H3EQY0\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1765467971;\n\tbh=QootsW6CCBrupABcm1TH+X3bNX87jr6TN34IAt+cBfM=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=U1H3EQY0PbjN9/0OH1oCCpQ4Ryz1spZZKRR5Ewa/EhhwAnlLBSXc+DApuYmXvNos4\n\t8Cgt5bYW+1gxwF+J+1KA3CB69FqreDv7JcD4gziVad1uQQvVVl+KfjcT2E2mMsB3+Z\n\tGXE7zchV/3r11CEe5ZDrSyJGfO2yFHv7K6R6zrDY=","Date":"Thu, 11 Dec 2025 16:46:09 +0100","From":"Jacopo Mondi ","To":"Rui Wang ","Cc":"libcamera-devel@lists.libcamera.org","Subject":"Re: [PATCH v4 3/7] ipa: rkisp1: algorithms: dpf: Refactor prepare()\n\tinto helpers","Message-ID":"","References":"<20251208004808.1274417-1-rui.wang@ideasonboard.com>\n\t<20251208004808.1274417-4-rui.wang@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20251208004808.1274417-4-rui.wang@ideasonboard.com>","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\" "}},{"id":37362,"web_url":"https://patchwork.libcamera.org/comment/37362/","msgid":"<67cb10a9c289197ae157d91edf584643.rui.wang@ideasonboard.com>","date":"2025-12-14T01:41:19","subject":"Re: [PATCH v4 3/7] ipa: rkisp1: algorithms: dpf: Refactor prepare()\n\tinto helpers","submitter":{"id":241,"url":"https://patchwork.libcamera.org/api/people/241/","name":"Rui Wang","email":"rui.wang@ideasonboard.com"},"content":"Jacopo Mondi wrote:\n> Hi Rui\n> \n> On Sun, Dec 07, 2025 at 07:48:04PM -0500, Rui Wang wrote:\n> > Split the prepare() function into prepareDisabledMode() and\n> > prepareEnabledMode() to improve readability and maintainability.\n> >\n> > This separates the logic for disabling and enabling the DPF, making\n> > the main prepare() function cleaner and easier to follow.\n> >\n> > Signed-off-by: Rui Wang \n> > ---\n> > changelog:\n> > - Move V3 prepareEnabledMode/prepareDisabledMode into this patch\n> >\n> > src/ipa/rkisp1/algorithms/dpf.cpp | 82 ++++++++++++++++++++-----------\n> > src/ipa/rkisp1/algorithms/dpf.h | 9 ++++\n> > 2 files changed, 62 insertions(+), 29 deletions(-)\n> >\n> > diff --git a/src/ipa/rkisp1/algorithms/dpf.cpp b/src/ipa/rkisp1/algorithms/dpf.cpp\n> > index 18f2a158..edb4c2bf 100644\n> > --- a/src/ipa/rkisp1/algorithms/dpf.cpp\n> > +++ b/src/ipa/rkisp1/algorithms/dpf.cpp\n> > @@ -320,38 +320,62 @@ 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> > +\tframeContext.dpf.denoise = false;\n> \n> If you get here, frameContext.dpf.denoise was false already\n>\n\nYes , looks this flag update is redudent , will remove in next series\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,\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 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> Add an empty line here\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> > +\n> \n> And drop this one\n> \nwill delete this blank line\n\n> > +\t*strengthConfig = strengthConfig_;\n> > }\n> >\n> > REGISTER_IPA_ALGORITHM(Dpf, \"Dpf\")\n> > diff --git a/src/ipa/rkisp1/algorithms/dpf.h b/src/ipa/rkisp1/algorithms/dpf.h\n> > index 30cbaa57..99cdbdd3 100644\n> > --- a/src/ipa/rkisp1/algorithms/dpf.h\n> > +++ b/src/ipa/rkisp1/algorithms/dpf.h\n> > @@ -44,6 +44,15 @@ private:\n> >\n> > \tbool loadReductionConfig(int32_t mode);\n> >\n> > +\tvoid prepareDisabledMode(IPAContext &context,\n> > +\t\t\t\t const uint32_t frame,\n> > +\t\t\t\t IPAFrameContext &frameContext,\n> > +\t\t\t\t RkISP1Params *params);\n> > +\tvoid prepareEnabledMode(IPAContext &context,\n> > +\t\t\t\tconst uint32_t frame,\n> > +\t\t\t\tIPAFrameContext &frameContext,\n> > +\t\t\t\tRkISP1Params *params);\n> > +\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> nits apart\n> Reviewed-by: Jacopo Mondi \n> \n> Thanks\n> j\n> \n> > \tstruct rkisp1_cif_isp_dpf_config config_;\n> > \tstruct rkisp1_cif_isp_dpf_strength_config strengthConfig_;\n> > \tstd::vector noiseReductionModes_;\n> > --\n> > 2.43.0\n> >","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 71D61BD1F1\n\tfor ;\n\tSun, 14 Dec 2025 01:41:34 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A0E7C61924;\n\tSun, 14 Dec 2025 02:41:33 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E39656142F\n\tfor ;\n\tSun, 14 Dec 2025 02:41:32 +0100 (CET)","from pyrite.rasen.tech (unknown [209.216.103.65])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C009C6A8;\n\tSun, 14 Dec 2025 02:41:28 +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=\"PGeB1cSb\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1765676489;\n\tbh=bN9/esIGUKfXSwDbrLmtJq22qn0F9ROzHoadiewpDk8=;\n\th=Date:From:To:Cc:In-Reply-To:References:Subject:From;\n\tb=PGeB1cSb9D5vrlXgaF2Eo8xcBtwCMjEgb7CrqwMHOZ1updTScmTfaRu4e1FG7dWEV\n\tZ53rbzCJFgjmlsI2K+7YL1ziMMGn5zDSAhnXTem/4UN0MYlwz0qxu72jqmlJByJ0Z1\n\tU1PPQn1WRpEOmZWerdIlHAOdowOeCHieSZr9/vMw=","Date":"Sat, 13 Dec 2025 20:41:19 -0500","Message-ID":"<67cb10a9c289197ae157d91edf584643.rui.wang@ideasonboard.com>","From":"Rui Wang ","To":"Jacopo Mondi ,\n\tRui Wang ","Cc":"libcamera-devel@lists.libcamera.org","In-Reply-To":"","References":"<20251208004808.1274417-1-rui.wang@ideasonboard.com>\n\t<20251208004808.1274417-4-rui.wang@ideasonboard.com>\n\t","Subject":"Re: [PATCH v4 3/7] ipa: rkisp1: algorithms: dpf: Refactor prepare()\n\tinto helpers","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\" "}}]