{"id":26217,"url":"https://patchwork.libcamera.org/api/patches/26217/?format=json","web_url":"https://patchwork.libcamera.org/patch/26217/","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":"<20260220221636.216353-2-rui.wang@ideasonboard.com>","date":"2026-02-20T22:16:30","name":"[v2,1/7] ipa: rkisp1: filter: Parse tuning modes/sharpness from config","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"3d4af845b2c65094eaf18bcc1cb6271bfce4c1cf","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/26217/mbox/","series":[{"id":5806,"url":"https://patchwork.libcamera.org/api/series/5806/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5806","date":"2026-02-20T22:16:29","name":"ipa: rkisp1: make Filter tuning-driven and add manual controls","version":2,"mbox":"https://patchwork.libcamera.org/series/5806/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/26217/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/26217/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 ABACEC31E9\n\tfor ;\n\tFri, 20 Feb 2026 22:16:58 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9FF1562275;\n\tFri, 20 Feb 2026 23:16:55 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8393161FBF\n\tfor ;\n\tFri, 20 Feb 2026 23:16:53 +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 20637502;\n\tFri, 20 Feb 2026 23:15: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=\"NTik3Bjr\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1771625759;\n\tbh=GauuDHtv0Vz48pGtsUQv+Z1WpKO5Ya6jB6yxkg+1kRw=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=NTik3Bjrc/YyLdrCO9S6QSZkYWcFirh1AuN6AK7Z6Vyimh7uV+sWcJ2FDiJsO8PGs\n\tAgegbSnYSLw1LcHPag1xsSCtDlJRXzKo+KHxSAW9oefjl95hyyCXJ0xpotripk8Z8o\n\tPm/k31uAjz9c4yucpfEKxJ+jvTwaR5COvwj8QVqI=","From":"Rui Wang ","To":"libcamera-devel@lists.libcamera.org","Cc":"Rui Wang ","Subject":"[PATCH v2 1/7] ipa: rkisp1: filter: Parse tuning modes/sharpness\n\tfrom config","Date":"Fri, 20 Feb 2026 17:16:30 -0500","Message-ID":"<20260220221636.216353-2-rui.wang@ideasonboard.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20260220221636.216353-1-rui.wang@ideasonboard.com>","References":"<20260220221636.216353-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 Filter tuning parsers for NoiseReductionModes and Sharpness,\n - Validate keys during parsing, and store parsed values\n in unordered_map/unordered_set-based containers for faster lookup\n and simpler key-based access.\n\nSample format in YAML:\n- Filter:\n NoiseReductionModes:\n NoiseReductionModeFast: [thresh_sh0: 18, thresh_sh1: 33, thresh_bl0: 8,\n\tthresh_bl1: 2, mode: 1, lum_weight: 2, grn_stage1: 4, chr_v_mode: 3,\n\tchr_h_mode: 3, fac_sh0: 4, fac_sh1: 4, fac_mid: 4, fac_bl0: 2, fac_bl1:0]\n Sharpness:\n\t - [fac_sh0: 4, fac_sh1: 4, fac_mid: 4, fac_bl0: 2, fac_bl1: 0]\n\nSigned-off-by: Rui Wang \n---\n src/ipa/rkisp1/algorithms/filter.cpp | 128 +++++++++++++++++++++++++++\n src/ipa/rkisp1/algorithms/filter.h | 10 +++\n 2 files changed, 138 insertions(+)","diff":"diff --git a/src/ipa/rkisp1/algorithms/filter.cpp b/src/ipa/rkisp1/algorithms/filter.cpp\nindex 8ad79801..85963f8c 100644\n--- a/src/ipa/rkisp1/algorithms/filter.cpp\n+++ b/src/ipa/rkisp1/algorithms/filter.cpp\n@@ -8,6 +8,7 @@\n #include \"filter.h\"\n \n #include \n+#include \n \n #include \n \n@@ -39,6 +40,18 @@ LOG_DEFINE_CATEGORY(RkISP1Filter)\n static constexpr uint32_t kFiltLumWeightDefault = 0x00022040;\n static constexpr uint32_t kFiltModeDefault = 0x000004f2;\n \n+namespace {\n+const std::unordered_set kSharpnessKeyNames = {\n+\t\"fac_sh0\", \"fac_sh1\", \"fac_mid\", \"fac_bl0\", \"fac_bl1\"\n+};\n+\n+const std::unordered_set kFilterKeyNames = {\n+\t\"thresh_sh0\", \"thresh_sh1\", \"thresh_bl0\", \"thresh_bl1\",\n+\t\"mode\", \"lum_weight\", \"grn_stage1\", \"chr_v_mode\", \"chr_h_mode\",\n+\t\"fac_sh0\", \"fac_sh1\", \"fac_mid\", \"fac_bl0\", \"fac_bl1\"\n+};\n+} /* namespace */\n+\n /**\n * \\copydoc libcamera::ipa::Algorithm::init\n */\n@@ -50,6 +63,121 @@ int Filter::init(IPAContext &context,\n \n \treturn 0;\n }\n+\n+int Filter::parseConfig(const YamlObject &tuningData)\n+{\n+\tif (!tuningData.contains(\"NoiseReductionModes\")) {\n+\t\tLOG(RkISP1Filter, Error) << \"Missing NoiseReductionModes in Filter tuning data\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tconst YamlObject &modesObject = tuningData[\"NoiseReductionModes\"];\n+\tif (!modesObject.isDictionary()) {\n+\t\tLOG(RkISP1Filter, Error) << \"NoiseReductionModes must be a dictionary\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tfor (const auto &[modeName, modeData] : modesObject.asDict()) {\n+\t\tauto it = controls::draft::NoiseReductionModeNameValueMap.find(modeName);\n+\t\tif (it == controls::draft::NoiseReductionModeNameValueMap.end()) {\n+\t\t\tLOG(RkISP1Filter, Error) << \"Unknown mode: \" << modeName;\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tint ret = parseModeConfig(modeData, modes_[it->second]);\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\t}\n+\n+\tif (!tuningData.contains(\"Sharpness\")) {\n+\t\tLOG(RkISP1Filter, Error) << \"Missing Sharpness in Filter tuning data\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tconst YamlObject &sharpnessObject = tuningData[\"Sharpness\"];\n+\tif (!sharpnessObject.isList()) {\n+\t\tLOG(RkISP1Filter, Error) << \"Sharpness must be a list\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tconst size_t sharpnessLevels = sharpnessObject.size();\n+\tif (!sharpnessLevels) {\n+\t\tLOG(RkISP1Filter, Error) << \"Sharpness must not be empty\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tsharpness_.assign(sharpnessLevels, {});\n+\n+\tfor (size_t i = 0; i < sharpnessLevels; i++) {\n+\t\tint ret = parseSharpnessConfig(sharpnessObject[i], sharpness_[i]);\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+int Filter::parseModeConfig(const YamlObject &modeData,\n+\t\t\t std::unordered_map &modeParams)\n+{\n+\tif (!modeData.isList()) {\n+\t\tLOG(RkISP1Filter, Error) << \"Mode config must be a list\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tfor (const auto &entry : modeData.asList()) {\n+\t\tfor (const auto &[key, val] : entry.asDict()) {\n+\t\t\tif (kFilterKeyNames.find(key) == kFilterKeyNames.end()) {\n+\t\t\t\tLOG(RkISP1Filter, Error)\n+\t\t\t\t\t<< \"Unknown mode key '\" << key << \"'\";\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\n+\t\t\tauto v = val.get();\n+\t\t\tif (!v) {\n+\t\t\t\tLOG(RkISP1Filter, Error)\n+\t\t\t\t\t<< \"Invalid value for key '\" << key << \"'\";\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\t\t\tmodeParams[key] = *v;\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n+int Filter::parseSharpnessConfig(const YamlObject &data,\n+\t\t\t\t std::unordered_map &sharpParams)\n+{\n+\tif (!data.isList()) {\n+\t\tLOG(RkISP1Filter, Error) << \"Sharpness entry must be a list\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tsharpParams.clear();\n+\n+\tfor (const auto &entry : data.asList()) {\n+\t\tfor (const auto &[key, val] : entry.asDict()) {\n+\t\t\tif (kSharpnessKeyNames.find(key) == kSharpnessKeyNames.end()) {\n+\t\t\t\tLOG(RkISP1Filter, Error)\n+\t\t\t\t\t<< \"Unknown sharpness key '\" << key << \"'\";\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\n+\t\t\tauto v = val.get();\n+\t\t\tif (!v) {\n+\t\t\t\tLOG(RkISP1Filter, Error)\n+\t\t\t\t\t<< \"Invalid value for key '\" << key << \"'\";\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\n+\t\t\tsharpParams[key] = *v;\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n /**\n * \\copydoc libcamera::ipa::Algorithm::queueRequest\n */\ndiff --git a/src/ipa/rkisp1/algorithms/filter.h b/src/ipa/rkisp1/algorithms/filter.h\nindex 37d8938d..83b90ef3 100644\n--- a/src/ipa/rkisp1/algorithms/filter.h\n+++ b/src/ipa/rkisp1/algorithms/filter.h\n@@ -28,6 +28,16 @@ public:\n \tvoid prepare(IPAContext &context, const uint32_t frame,\n \t\t IPAFrameContext &frameContext,\n \t\t RkISP1Params *params) override;\n+\n+private:\n+\tint parseConfig(const YamlObject &tuningData);\n+\tint parseModeConfig(const YamlObject &modeData,\n+\t\t\t std::unordered_map &modeParams);\n+\tint parseSharpnessConfig(const YamlObject &data,\n+\t\t\t\t std::unordered_map &sharpParams);\n+\n+\tstd::unordered_map> modes_;\n+\tstd::vector> sharpness_;\n };\n \n } /* namespace ipa::rkisp1::algorithms */\n","prefixes":["v2","1/7"]}