Patch Detail
Show a patch.
GET /api/1.1/patches/26218/?format=api
{ "id": 26218, "url": "https://patchwork.libcamera.org/api/1.1/patches/26218/?format=api", "web_url": "https://patchwork.libcamera.org/patch/26218/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "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-3-rui.wang@ideasonboard.com>", "date": "2026-02-20T22:16:31", "name": "[v2,2/7] ipa: rkisp1: filter: Apply tuning-based sharpness and filter", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "29ba2971a46f40fa66d3c069466a971bcba070df", "submitter": { "id": 241, "url": "https://patchwork.libcamera.org/api/1.1/people/241/?format=api", "name": "Rui Wang", "email": "rui.wang@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/26218/mbox/", "series": [ { "id": 5806, "url": "https://patchwork.libcamera.org/api/1.1/series/5806/?format=api", "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/26218/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/26218/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 45E49C3240\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 20 Feb 2026 22:17:00 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2EFDE6228B;\n\tFri, 20 Feb 2026 23:16:57 +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 3EAB96226A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 20 Feb 2026 23:16:54 +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 DECE5371;\n\tFri, 20 Feb 2026 23:15:59 +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=\"Savrw4Qh\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1771625760;\n\tbh=GvPUZfcy7pWFiVaaaKZ2q4Lc6/G5mnV3eW8ChAEXksI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Savrw4QhjpHuReKfpuall5Q4/VHSuk705CH423NncVKNnqOznl2qkQuc5877Gyc5o\n\tXyVMlVmKyWj8sUg72cJ+Kn6pEILQ2wBWLIYsl1HkvbUwHA7HZZNR998j+UlYumavmw\n\tVOIgzktTg5UwxjqXDPGSAEtAKyDvixFC98ntspbg=", "From": "Rui Wang <rui.wang@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Rui Wang <rui.wang@ideasonboard.com>", "Subject": "[PATCH v2 2/7] ipa: rkisp1: filter: Apply tuning-based sharpness and\n\tfilter", "Date": "Fri, 20 Feb 2026 17:16:31 -0500", "Message-ID": "<20260220221636.216353-3-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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "-Simplify denoise mode handling by storing the control value directly\n -Rework prepare() to load filter registers from parsed mode tuning data,\n -Disable filter when NoiseReductionModeOff,\n -Override fac_* from sharpness tuning levels when valid.\n\nSigned-off-by: Rui Wang <rui.wang@ideasonboard.com>\n---\n src/ipa/rkisp1/algorithms/filter.cpp | 158 ++++++++-------------------\n 1 file changed, 43 insertions(+), 115 deletions(-)", "diff": "diff --git a/src/ipa/rkisp1/algorithms/filter.cpp b/src/ipa/rkisp1/algorithms/filter.cpp\nindex 85963f8c..739a0c4d 100644\n--- a/src/ipa/rkisp1/algorithms/filter.cpp\n+++ b/src/ipa/rkisp1/algorithms/filter.cpp\n@@ -205,31 +205,10 @@ void Filter::queueRequest(IPAContext &context,\n \tif (denoise) {\n \t\tLOG(RkISP1Filter, Debug) << \"Set denoise to \" << *denoise;\n \n-\t\tswitch (*denoise) {\n-\t\tcase controls::draft::NoiseReductionModeOff:\n-\t\t\tif (filter.denoise != 0) {\n-\t\t\t\tfilter.denoise = 0;\n-\t\t\t\tupdate = true;\n-\t\t\t}\n-\t\t\tbreak;\n-\t\tcase controls::draft::NoiseReductionModeMinimal:\n-\t\t\tif (filter.denoise != 1) {\n-\t\t\t\tfilter.denoise = 1;\n-\t\t\t\tupdate = true;\n-\t\t\t}\n-\t\t\tbreak;\n-\t\tcase controls::draft::NoiseReductionModeHighQuality:\n-\t\tcase controls::draft::NoiseReductionModeFast:\n-\t\t\tif (filter.denoise != 3) {\n-\t\t\t\tfilter.denoise = 3;\n-\t\t\t\tupdate = true;\n-\t\t\t}\n-\t\t\tbreak;\n-\t\tdefault:\n-\t\t\tLOG(RkISP1Filter, Error)\n-\t\t\t\t<< \"Unsupported denoise value \"\n-\t\t\t\t<< *denoise;\n-\t\t\tbreak;\n+\t\tuint8_t value = static_cast<uint8_t>(*denoise);\n+\t\tif (filter.denoise != value) {\n+\t\t\tfilter.denoise = value;\n+\t\t\tupdate = true;\n \t\t}\n \t}\n \n@@ -242,108 +221,57 @@ void Filter::queueRequest(IPAContext &context,\n * \\copydoc libcamera::ipa::Algorithm::prepare\n */\n void Filter::prepare([[maybe_unused]] IPAContext &context,\n-\t\t [[maybe_unused]] const uint32_t frame,\n+\t\t const uint32_t frame,\n \t\t IPAFrameContext &frameContext, RkISP1Params *params)\n {\n \t/* Check if the algorithm configuration has been updated. */\n-\tif (!frameContext.filter.update)\n+\tif (!frameContext.filter.update && frame > 0)\n \t\treturn;\n \n-\tstatic constexpr uint16_t filt_fac_sh0[] = {\n-\t\t0x04, 0x07, 0x0a, 0x0c, 0x10, 0x14, 0x1a, 0x1e, 0x24, 0x2a, 0x30\n-\t};\n-\n-\tstatic constexpr uint16_t filt_fac_sh1[] = {\n-\t\t0x04, 0x08, 0x0c, 0x10, 0x16, 0x1b, 0x20, 0x26, 0x2c, 0x30, 0x3f\n-\t};\n-\n-\tstatic constexpr uint16_t filt_fac_mid[] = {\n-\t\t0x04, 0x06, 0x08, 0x0a, 0x0c, 0x10, 0x13, 0x17, 0x1d, 0x22, 0x28\n-\t};\n-\n-\tstatic constexpr uint16_t filt_fac_bl0[] = {\n-\t\t0x02, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x10, 0x15, 0x1a, 0x24\n-\t};\n-\n-\tstatic constexpr uint16_t filt_fac_bl1[] = {\n-\t\t0x00, 0x00, 0x00, 0x02, 0x04, 0x04, 0x06, 0x08, 0x0d, 0x14, 0x20\n-\t};\n-\n-\tstatic constexpr uint16_t filt_thresh_sh0[] = {\n-\t\t0, 18, 26, 36, 41, 75, 90, 120, 170, 250, 1023\n-\t};\n-\n-\tstatic constexpr uint16_t filt_thresh_sh1[] = {\n-\t\t0, 33, 44, 51, 67, 100, 120, 150, 200, 300, 1023\n-\t};\n-\n-\tstatic constexpr uint16_t filt_thresh_bl0[] = {\n-\t\t0, 8, 13, 23, 26, 50, 60, 80, 140, 180, 1023\n-\t};\n-\n-\tstatic constexpr uint16_t filt_thresh_bl1[] = {\n-\t\t0, 2, 5, 10, 15, 20, 26, 51, 100, 150, 1023\n-\t};\n-\n-\tstatic constexpr uint16_t stage1_select[] = {\n-\t\t6, 6, 4, 4, 3, 3, 2, 2, 2, 1, 0\n-\t};\n-\n-\tstatic constexpr uint16_t filt_chr_v_mode[] = {\n-\t\t1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3\n-\t};\n-\n-\tstatic constexpr uint16_t filt_chr_h_mode[] = {\n-\t\t0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3\n-\t};\n-\n \tuint8_t denoise = frameContext.filter.denoise;\n \tuint8_t sharpness = frameContext.filter.sharpness;\n-\n \tauto config = params->block<BlockType::Flt>();\n+\tif (denoise == controls::draft::NoiseReductionModeOff) {\n+\t\tconfig.setEnabled(false);\n+\t\treturn;\n+\t}\n \tconfig.setEnabled(true);\n \n-\tconfig->fac_sh0 = filt_fac_sh0[sharpness];\n-\tconfig->fac_sh1 = filt_fac_sh1[sharpness];\n-\tconfig->fac_mid = filt_fac_mid[sharpness];\n-\tconfig->fac_bl0 = filt_fac_bl0[sharpness];\n-\tconfig->fac_bl1 = filt_fac_bl1[sharpness];\n-\n-\tconfig->lum_weight = kFiltLumWeightDefault;\n-\tconfig->mode = kFiltModeDefault;\n-\tconfig->thresh_sh0 = filt_thresh_sh0[denoise];\n-\tconfig->thresh_sh1 = filt_thresh_sh1[denoise];\n-\tconfig->thresh_bl0 = filt_thresh_bl0[denoise];\n-\tconfig->thresh_bl1 = filt_thresh_bl1[denoise];\n-\tconfig->grn_stage1 = stage1_select[denoise];\n-\tconfig->chr_v_mode = filt_chr_v_mode[denoise];\n-\tconfig->chr_h_mode = filt_chr_h_mode[denoise];\n-\n-\t/*\n-\t * Combined high denoising and high sharpening requires some\n-\t * adjustments to the configuration of the filters. A first stage\n-\t * filter with a lower strength must be selected, and the blur factors\n-\t * must be decreased.\n-\t */\n-\tif (denoise == 9) {\n-\t\tif (sharpness > 3)\n-\t\t\tconfig->grn_stage1 = 2;\n-\t} else if (denoise == 10) {\n-\t\tif (sharpness > 5)\n-\t\t\tconfig->grn_stage1 = 2;\n-\t\telse if (sharpness > 3)\n-\t\t\tconfig->grn_stage1 = 1;\n+\tauto it = modes_.find(denoise);\n+\tif (it == modes_.end()) {\n+\t\tLOG(RkISP1Filter, Warning) << \"No filter config for mode \" << denoise;\n+\t\treturn;\n \t}\n-\n-\tif (denoise > 7) {\n-\t\tif (sharpness > 7) {\n-\t\t\tconfig->fac_bl0 /= 2;\n-\t\t\tconfig->fac_bl1 /= 4;\n-\t\t} else if (sharpness > 4) {\n-\t\t\tconfig->fac_bl0 = config->fac_bl0 * 3 / 4;\n-\t\t\tconfig->fac_bl1 /= 2;\n-\t\t}\n+\tauto &modeParams = it->second;\n+\n+\tconfig->thresh_sh0 = modeParams[\"thresh_sh0\"];\n+\tconfig->thresh_sh1 = modeParams[\"thresh_sh1\"];\n+\tconfig->thresh_bl0 = modeParams[\"thresh_bl0\"];\n+\tconfig->thresh_bl1 = modeParams[\"thresh_bl1\"];\n+\tconfig->mode = modeParams[\"mode\"];\n+\tconfig->lum_weight = modeParams[\"lum_weight\"];\n+\tconfig->grn_stage1 = modeParams[\"grn_stage1\"];\n+\tconfig->chr_v_mode = modeParams[\"chr_v_mode\"];\n+\tconfig->chr_h_mode = modeParams[\"chr_h_mode\"];\n+\tconfig->fac_sh0 = modeParams[\"fac_sh0\"];\n+\tconfig->fac_sh1 = modeParams[\"fac_sh1\"];\n+\tconfig->fac_mid = modeParams[\"fac_mid\"];\n+\tconfig->fac_bl0 = modeParams[\"fac_bl0\"];\n+\tconfig->fac_bl1 = modeParams[\"fac_bl1\"];\n+\n+\tif (sharpness == 0 or sharpness >= sharpness_.size()) {\n+\t\tLOG(RkISP1Filter, Debug)\n+\t\t\t<< \"Sharpness value out of range: \" << static_cast<int>(sharpness);\n+\t\treturn;\n \t}\n+\n+\t/* sharpness override filter register .*/\n+\tconst auto &sharp = sharpness_[sharpness];\n+\tconfig->fac_sh0 = sharp.at(\"fac_sh0\");\n+\tconfig->fac_sh1 = sharp.at(\"fac_sh1\");\n+\tconfig->fac_mid = sharp.at(\"fac_mid\");\n+\tconfig->fac_bl0 = sharp.at(\"fac_bl0\");\n+\tconfig->fac_bl1 = sharp.at(\"fac_bl1\");\n }\n \n REGISTER_IPA_ALGORITHM(Filter, \"Filter\")\n", "prefixes": [ "v2", "2/7" ] }