{"id":25549,"url":"https://patchwork.libcamera.org/api/patches/25549/?format=json","web_url":"https://patchwork.libcamera.org/patch/25549/","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":"<20251214181646.573675-2-rui.wang@ideasonboard.com>","date":"2025-12-14T18:16:41","name":"[v5,1/6] ipa: rkisp1: algorithms: dpf: refactor DPF parsing and initialization","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"93799f07accfd41c13a048367075462cf85ce74d","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/25549/mbox/","series":[{"id":5660,"url":"https://patchwork.libcamera.org/api/series/5660/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5660","date":"2025-12-14T18:16:40","name":"refactor DPF parsing and initialization","version":5,"mbox":"https://patchwork.libcamera.org/series/5660/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/25549/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/25549/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 8B5A8C3257\n\tfor ;\n\tSun, 14 Dec 2025 18:17:07 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 13D8B61950;\n\tSun, 14 Dec 2025 19:17:07 +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 E18E961934\n\tfor ;\n\tSun, 14 Dec 2025 19:17:03 +0100 (CET)","from rui-Precision-7560.local (unknown [209.216.103.65])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id EEAF355A;\n\tSun, 14 Dec 2025 19:16:58 +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=\"QTlNRGjC\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1765736219;\n\tbh=tAlXdRIgvImexT5D0WR11aQYtN1r/AT2cYEKiMjahEI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=QTlNRGjCtdi2BHAl5TZUF2gTC3/UqCo7hw8Ttss/cekeuhPEcDyjX6ijnvhhEoTWw\n\trGlp18DoDBHy74C8DmuRi/Q/Qm3v8/8oJ6RAU5w9Hoq0qvGaEzbjPdfjUL6DLBdbmG\n\tmeYGCCJSDPxR1MWOf4qRuIDLP44jTpAIXyH2PF5s=","From":"Rui Wang ","To":"libcamera-devel@lists.libcamera.org","Cc":"Rui Wang ","Subject":"[PATCH v5 1/6] ipa: rkisp1: algorithms: dpf: refactor DPF parsing\n\tand initialization","Date":"Sun, 14 Dec 2025 13:16:41 -0500","Message-ID":"<20251214181646.573675-2-rui.wang@ideasonboard.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20251214181646.573675-1-rui.wang@ideasonboard.com>","References":"<20251214181646.573675-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 DPF configuration parsing and initialization into clearer,\nself-contained helpers and modernized initialization patterns.\n\nIntroduce parseSingleConfig() as DPF tuning file parser helper\nmake future extensions and maintenance easier.\n\nChange strengthconfig.r/g/b parser from uint16 to uint8\nto match rkisp1_cif_isp_dpf_strength_config defination.\n\nSigned-off-by: Rui Wang \n---\n\nchangelog:\n - propagates specific integer error codes (e.g. -EINVAL) from \n parseConfig and parseSingleConfig instead of \n returning boolean false values, improving error reporting.\n - format the code : Unbraced if (single-statement if)\n\n src/ipa/rkisp1/algorithms/dpf.cpp | 52 ++++++++++++++++++++++---------\n src/ipa/rkisp1/algorithms/dpf.h | 5 +++\n 2 files changed, 42 insertions(+), 15 deletions(-)","diff":"diff --git a/src/ipa/rkisp1/algorithms/dpf.cpp b/src/ipa/rkisp1/algorithms/dpf.cpp\nindex 39f3e461..dd3effa1 100644\n--- a/src/ipa/rkisp1/algorithms/dpf.cpp\n+++ b/src/ipa/rkisp1/algorithms/dpf.cpp\n@@ -46,6 +46,28 @@ Dpf::Dpf()\n */\n int Dpf::init([[maybe_unused]] IPAContext &context,\n \t const YamlObject &tuningData)\n+{\n+\t/* Parse tuning block. */\n+\tint ret = parseConfig(tuningData);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\treturn 0;\n+}\n+\n+int Dpf::parseConfig(const YamlObject &tuningData)\n+{\n+\t/* Parse base config. */\n+\tint ret = parseSingleConfig(tuningData, config_, strengthConfig_);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\treturn 0;\n+}\n+\n+int Dpf::parseSingleConfig(const YamlObject &tuningData,\n+\t\t\t rkisp1_cif_isp_dpf_config &config,\n+\t\t\t rkisp1_cif_isp_dpf_strength_config &strengthConfig)\n {\n \tstd::vector values;\n \n@@ -82,10 +104,10 @@ int Dpf::init([[maybe_unused]] IPAContext &context,\n \t}\n \n \tstd::copy_n(values.begin(), values.size(),\n-\t\t std::begin(config_.g_flt.spatial_coeff));\n+\t\t std::begin(config.g_flt.spatial_coeff));\n \n-\tconfig_.g_flt.gr_enable = true;\n-\tconfig_.g_flt.gb_enable = true;\n+\tconfig.g_flt.gr_enable = true;\n+\tconfig.g_flt.gb_enable = true;\n \n \t/*\n \t * For the red and blue components, we have the 13x9 kernel specified\n@@ -119,15 +141,15 @@ int Dpf::init([[maybe_unused]] IPAContext &context,\n \t\treturn -EINVAL;\n \t}\n \n-\tconfig_.rb_flt.fltsize = values.size() == RKISP1_CIF_ISP_DPF_MAX_SPATIAL_COEFFS\n-\t\t\t ? RKISP1_CIF_ISP_DPF_RB_FILTERSIZE_13x9\n-\t\t\t : RKISP1_CIF_ISP_DPF_RB_FILTERSIZE_9x9;\n+\tconfig.rb_flt.fltsize = values.size() == RKISP1_CIF_ISP_DPF_MAX_SPATIAL_COEFFS\n+\t\t\t\t\t? RKISP1_CIF_ISP_DPF_RB_FILTERSIZE_13x9\n+\t\t\t\t\t: RKISP1_CIF_ISP_DPF_RB_FILTERSIZE_9x9;\n \n \tstd::copy_n(values.begin(), values.size(),\n-\t\t std::begin(config_.rb_flt.spatial_coeff));\n+\t\t std::begin(config.rb_flt.spatial_coeff));\n \n-\tconfig_.rb_flt.r_enable = true;\n-\tconfig_.rb_flt.b_enable = true;\n+\tconfig.rb_flt.r_enable = true;\n+\tconfig.rb_flt.b_enable = true;\n \n \t/*\n \t * The range kernel is configured with a noise level lookup table (NLL)\n@@ -147,13 +169,13 @@ int Dpf::init([[maybe_unused]] IPAContext &context,\n \t}\n \n \tstd::copy_n(nllValues.begin(), nllValues.size(),\n-\t\t std::begin(config_.nll.coeff));\n+\t\t std::begin(config.nll.coeff));\n \n \tstd::string scaleMode = rFObject[\"scale-mode\"].get(\"\");\n \tif (scaleMode == \"linear\") {\n-\t\tconfig_.nll.scale_mode = RKISP1_CIF_ISP_NLL_SCALE_LINEAR;\n+\t\tconfig.nll.scale_mode = RKISP1_CIF_ISP_NLL_SCALE_LINEAR;\n \t} else if (scaleMode == \"logarithmic\") {\n-\t\tconfig_.nll.scale_mode = RKISP1_CIF_ISP_NLL_SCALE_LOGARITHMIC;\n+\t\tconfig.nll.scale_mode = RKISP1_CIF_ISP_NLL_SCALE_LOGARITHMIC;\n \t} else {\n \t\tLOG(RkISP1Dpf, Error)\n \t\t\t<< \"Invalid 'RangeFilter:scale-mode': expected \"\n@@ -164,9 +186,9 @@ int Dpf::init([[maybe_unused]] IPAContext &context,\n \n \tconst YamlObject &fSObject = tuningData[\"FilterStrength\"];\n \n-\tstrengthConfig_.r = fSObject[\"r\"].get(64);\n-\tstrengthConfig_.g = fSObject[\"g\"].get(64);\n-\tstrengthConfig_.b = fSObject[\"b\"].get(64);\n+\tstrengthConfig.r = fSObject[\"r\"].get().value_or(64);\n+\tstrengthConfig.g = fSObject[\"g\"].get().value_or(64);\n+\tstrengthConfig.b = fSObject[\"b\"].get().value_or(64);\n \n \treturn 0;\n }\ndiff --git a/src/ipa/rkisp1/algorithms/dpf.h b/src/ipa/rkisp1/algorithms/dpf.h\nindex 2dd8cd36..39186c55 100644\n--- a/src/ipa/rkisp1/algorithms/dpf.h\n+++ b/src/ipa/rkisp1/algorithms/dpf.h\n@@ -30,6 +30,11 @@ public:\n \t\t RkISP1Params *params) override;\n \n private:\n+\tint parseConfig(const YamlObject &tuningData);\n+\tint parseSingleConfig(const YamlObject &tuningData,\n+\t\t\t rkisp1_cif_isp_dpf_config &config,\n+\t\t\t rkisp1_cif_isp_dpf_strength_config &strengthConfig);\n+\n \tstruct rkisp1_cif_isp_dpf_config config_;\n \tstruct rkisp1_cif_isp_dpf_strength_config strengthConfig_;\n };\n","prefixes":["v5","1/6"]}