{"id":25550,"url":"https://patchwork.libcamera.org/api/1.1/patches/25550/?format=json","web_url":"https://patchwork.libcamera.org/patch/25550/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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-3-rui.wang@ideasonboard.com>","date":"2025-12-14T18:16:42","name":"[v5,2/6] ipa: rkisp1: algorithms: dpf: Implement mode switching","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"0ea990174f7b35c1af9d9355f599b119204dc61e","submitter":{"id":241,"url":"https://patchwork.libcamera.org/api/1.1/people/241/?format=json","name":"Rui Wang","email":"rui.wang@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/25550/mbox/","series":[{"id":5660,"url":"https://patchwork.libcamera.org/api/1.1/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/25550/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/25550/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 34F10C3257\n\tfor ;\n\tSun, 14 Dec 2025 18:17:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DA30A61958;\n\tSun, 14 Dec 2025 19:17:09 +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 BB54861944\n\tfor ;\n\tSun, 14 Dec 2025 19:17:06 +0100 (CET)","from rui-Precision-7560.local (unknown [209.216.103.65])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2550E8D4;\n\tSun, 14 Dec 2025 19:17:02 +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=\"bIyMs3Ts\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1765736222;\n\tbh=NmVsPnTI756aEloEpCdc/ldAl7Whg8MrH2YQmudutd4=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=bIyMs3Ts1xTkc6Lzk9/gmUUgxl6Qbrp4BStGSwuDEoqBY7rvK55Ue38YVwdxovA4f\n\tyZZrbGCBTz80AhRr5pQUfuEte18lV5b02ln1mJ3rROT3T+JPU6nFCfixWrNqzy/Vj4\n\tPUb0SpJgqIXnbqbFb8iRuYyB0JDa6Vm7RJHz5CQk=","From":"Rui Wang ","To":"libcamera-devel@lists.libcamera.org","Cc":"Rui Wang ","Subject":"[PATCH v5 2/6] ipa: rkisp1: algorithms: dpf: Implement mode\n\tswitching","Date":"Sun, 14 Dec 2025 13:16:42 -0500","Message-ID":"<20251214181646.573675-3-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":"Add support for switching between different noise reduction modes.\n\nIntroduce `noiseReductionModes_` to store mode-specific configs.\n\nLoadReductionConfig() select specific config from configs.\n\nSigned-off-by: Rui Wang \n---\n\nchangelog: \n - Format commit message\n - Refactored parseModes to utilize kModesMap for string-to-mode lookups, \n replacing the previous if-else chain.\n - Fixed logic in queueRequest to load configuration using the requested \n *denoise mode instead of the stale runningMode_.\n\n src/ipa/rkisp1/algorithms/dpf.cpp | 91 +++++++++++++++++++++++++++++--\n src/ipa/rkisp1/algorithms/dpf.h | 11 ++++\n 2 files changed, 97 insertions(+), 5 deletions(-)","diff":"diff --git a/src/ipa/rkisp1/algorithms/dpf.cpp b/src/ipa/rkisp1/algorithms/dpf.cpp\nindex dd3effa1..392edda1 100644\n--- a/src/ipa/rkisp1/algorithms/dpf.cpp\n+++ b/src/ipa/rkisp1/algorithms/dpf.cpp\n@@ -8,6 +8,7 @@\n #include \"dpf.h\"\n \n #include \n+#include \n #include \n #include \n \n@@ -36,8 +37,20 @@ namespace ipa::rkisp1::algorithms {\n \n LOG_DEFINE_CATEGORY(RkISP1Dpf)\n \n+namespace {\n+\n+const std::map kModesMap = {\n+\t{ controls::draft::NoiseReductionModeMinimal, \"minimal\" },\n+\t{ controls::draft::NoiseReductionModeFast, \"fast\" },\n+\t{ controls::draft::NoiseReductionModeHighQuality, \"highquality\" },\n+\t{ controls::draft::NoiseReductionModeZSL, \"zsl\" },\n+};\n+\n+} /* namespace */\n+\n Dpf::Dpf()\n-\t: config_({}), strengthConfig_({})\n+\t: config_({}), strengthConfig_({}), noiseReductionModes_({}),\n+\t runningMode_(controls::draft::NoiseReductionModeOff)\n {\n }\n \n@@ -62,6 +75,48 @@ int Dpf::parseConfig(const YamlObject &tuningData)\n \tif (ret)\n \t\treturn ret;\n \n+\t/* Parse modes. */\n+\tret = parseModes(tuningData);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\treturn 0;\n+}\n+\n+int Dpf::parseModes(const YamlObject &tuningData)\n+{\n+\t/* Parse noise reduction modes. */\n+\tif (!tuningData.contains(\"modes\"))\n+\t\treturn -EINVAL;\n+\n+\tnoiseReductionModes_.clear();\n+\tfor (const auto &entry : tuningData[\"modes\"].asList()) {\n+\t\tstd::optional typeOpt =\n+\t\t\tentry[\"type\"].get();\n+\t\tif (!typeOpt) {\n+\t\t\tLOG(RkISP1Dpf, Error) << \"Modes entry missing type\";\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tModeConfig mode;\n+\t\tauto it = std::find_if(kModesMap.begin(), kModesMap.end(),\n+\t\t\t\t [&typeOpt](const auto &pair) {\n+\t\t\t\t\t return pair.second == *typeOpt;\n+\t\t\t\t });\n+\n+\t\tif (it == kModesMap.end()) {\n+\t\t\tLOG(RkISP1Dpf, Error) << \"Unknown mode type: \" << *typeOpt;\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tmode.modeValue = it->first;\n+\t\tauto ret = parseSingleConfig(entry, mode.dpf, mode.strength);\n+\t\tif (ret != 0)\n+\t\t\treturn ret;\n+\n+\t\tnoiseReductionModes_.push_back(mode);\n+\t}\n+\n \treturn 0;\n }\n \n@@ -193,6 +248,29 @@ int Dpf::parseSingleConfig(const YamlObject &tuningData,\n \treturn 0;\n }\n \n+bool Dpf::loadReductionConfig(int32_t mode)\n+{\n+\tauto it = std::find_if(noiseReductionModes_.begin(), noiseReductionModes_.end(),\n+\t\t\t [mode](const ModeConfig &m) {\n+\t\t\t\t return m.modeValue == mode;\n+\t\t\t });\n+\tif (it == noiseReductionModes_.end()) {\n+\t\tLOG(RkISP1Dpf, Warning)\n+\t\t\t<< \"No DPF config for reduction mode \"\n+\t\t\t<< static_cast(mode);\n+\t\treturn false;\n+\t}\n+\n+\tconfig_ = it->dpf;\n+\tstrengthConfig_ = it->strength;\n+\n+\tLOG(RkISP1Dpf, Info)\n+\t\t<< \"DPF mode=Reduction (config loaded)\"\n+\t\t<< \" mode=\" << kModesMap.at(mode);\n+\n+\treturn true;\n+}\n+\n /**\n * \\copydoc libcamera::ipa::Algorithm::queueRequest\n */\n@@ -206,8 +284,6 @@ void Dpf::queueRequest(IPAContext &context,\n \n \tconst auto &denoise = controls.get(controls::draft::NoiseReductionMode);\n \tif (denoise) {\n-\t\tLOG(RkISP1Dpf, Debug) << \"Set denoise to \" << *denoise;\n-\n \t\tswitch (*denoise) {\n \t\tcase controls::draft::NoiseReductionModeOff:\n \t\t\tif (dpf.denoise) {\n@@ -218,9 +294,10 @@ void Dpf::queueRequest(IPAContext &context,\n \t\tcase controls::draft::NoiseReductionModeMinimal:\n \t\tcase controls::draft::NoiseReductionModeHighQuality:\n \t\tcase controls::draft::NoiseReductionModeFast:\n-\t\t\tif (!dpf.denoise) {\n-\t\t\t\tdpf.denoise = true;\n+\t\tcase controls::draft::NoiseReductionModeZSL:\n+\t\t\tif (loadReductionConfig(*denoise)) {\n \t\t\t\tupdate = true;\n+\t\t\t\tdpf.denoise = true;\n \t\t\t}\n \t\t\tbreak;\n \t\tdefault:\n@@ -229,6 +306,10 @@ void Dpf::queueRequest(IPAContext &context,\n \t\t\t\t<< *denoise;\n \t\t\tbreak;\n \t\t}\n+\t\tif (update) {\n+\t\t\trunningMode_ = *denoise;\n+\t\t\tLOG(RkISP1Dpf, Debug) << \"Set denoise to \" << kModesMap.at(runningMode_);\n+\t\t}\n \t}\n \n \tframeContext.dpf.denoise = dpf.denoise;\ndiff --git a/src/ipa/rkisp1/algorithms/dpf.h b/src/ipa/rkisp1/algorithms/dpf.h\nindex 39186c55..2a2c7052 100644\n--- a/src/ipa/rkisp1/algorithms/dpf.h\n+++ b/src/ipa/rkisp1/algorithms/dpf.h\n@@ -30,13 +30,24 @@ public:\n \t\t RkISP1Params *params) override;\n \n private:\n+\tstruct ModeConfig {\n+\t\tint32_t modeValue;\n+\t\trkisp1_cif_isp_dpf_config dpf;\n+\t\trkisp1_cif_isp_dpf_strength_config strength;\n+\t};\n+\n \tint parseConfig(const YamlObject &tuningData);\n+\tint parseModes(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+\tbool loadReductionConfig(int32_t mode);\n+\n \tstruct rkisp1_cif_isp_dpf_config config_;\n \tstruct rkisp1_cif_isp_dpf_strength_config strengthConfig_;\n+\tstd::vector noiseReductionModes_;\n+\tint32_t runningMode_;\n };\n \n } /* namespace ipa::rkisp1::algorithms */\n","prefixes":["v5","2/6"]}