Patch Detail
Show a patch.
GET /api/1.1/patches/25004/?format=api
{ "id": 25004, "url": "https://patchwork.libcamera.org/api/1.1/patches/25004/?format=api", "web_url": "https://patchwork.libcamera.org/patch/25004/", "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": "<20251112082715.17823-7-mzamazal@redhat.com>", "date": "2025-11-12T08:27:14", "name": "[RFC,6/7] libcamera: ipa: simple: Separate saturation from CCM", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "5cd527a0ed0143b4b150847d4b23cca340648a8d", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/1.1/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/25004/mbox/", "series": [ { "id": 5582, "url": "https://patchwork.libcamera.org/api/1.1/series/5582/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5582", "date": "2025-11-12T08:27:08", "name": "Simple pipeline IPA cleanup", "version": 1, "mbox": "https://patchwork.libcamera.org/series/5582/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/25004/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/25004/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 60FFCC3241\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 12 Nov 2025 08:27:38 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8DEFF60AAD;\n\tWed, 12 Nov 2025 09:27:37 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 229D060A86\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 12 Nov 2025 09:27:34 +0100 (CET)", "from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-38-M5fDyvRsPMKkSxmPKgYN5g-1;\n\tWed, 12 Nov 2025 03:27:31 -0500", "from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.93])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS\n\tid 15C611956095 for <libcamera-devel@lists.libcamera.org>;\n\tWed, 12 Nov 2025 08:27:31 +0000 (UTC)", "from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.33.149])\n\tby mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 265881800451; Wed, 12 Nov 2025 08:27:29 +0000 (UTC)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"Fpvt5leF\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1762936053;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=BL1Y/mpIV+/ssHWmbHQ0Ivl9xvySKR0aQ6uJfhx57kU=;\n\tb=Fpvt5leFLDPa01jkWb1Ev7byaJZi0AEVPgOI71ZxlPCdn5ozWn3lXucKyXnk6ND62yCn8K\n\tofLX33pTs4eR0x6eCBFsKQJ9GXEBCOxyRErLkamW7/1pZhKBo6JJeaGIFHZXcM7/sPuHQ4\n\tn2HUAnmY3RTbLgmDRzcoNcXeupUhaBw=", "X-MC-Unique": "M5fDyvRsPMKkSxmPKgYN5g-1", "X-Mimecast-MFC-AGG-ID": "M5fDyvRsPMKkSxmPKgYN5g_1762936051", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>", "Subject": "[RFC PATCH 6/7] libcamera: ipa: simple: Separate saturation from CCM", "Date": "Wed, 12 Nov 2025 09:27:14 +0100", "Message-ID": "<20251112082715.17823-7-mzamazal@redhat.com>", "In-Reply-To": "<20251112082715.17823-1-mzamazal@redhat.com>", "References": "<20251112082715.17823-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.30.177.93", "X-Mimecast-Spam-Score": "0", "X-Mimecast-MFC-PROC-ID": "9fwLKz9J4571igV-Pfp2YXluKMMjD9oZjSZ9RCm1CeM_1762936051", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "content-type": "text/plain; charset=\"US-ASCII\"; x-default=true", "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": "Saturation adjustments are implemented using matrix operations. They\nare currently applied to the colour correction matrix. Let's move them\nto a newly introduced separate \"Adjust\" algorithm.\n\nThis separation has the following advantages:\n\n- It allows disabling general colour adjustments algorithms without\n disabling the CCM algorithm.\n\n- It keeps the CCM separated from other corrections.\n\n- It's generally cleaner.\n\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n src/ipa/simple/algorithms/adjust.cpp | 111 ++++++++++++++++++++++++++\n src/ipa/simple/algorithms/adjust.h | 52 ++++++++++++\n src/ipa/simple/algorithms/ccm.cpp | 58 +-------------\n src/ipa/simple/algorithms/ccm.h | 10 +--\n src/ipa/simple/algorithms/meson.build | 1 +\n src/ipa/simple/data/uncalibrated.yaml | 1 +\n 6 files changed, 169 insertions(+), 64 deletions(-)\n create mode 100644 src/ipa/simple/algorithms/adjust.cpp\n create mode 100644 src/ipa/simple/algorithms/adjust.h", "diff": "diff --git a/src/ipa/simple/algorithms/adjust.cpp b/src/ipa/simple/algorithms/adjust.cpp\nnew file mode 100644\nindex 000000000..282b3ccb0\n--- /dev/null\n+++ b/src/ipa/simple/algorithms/adjust.cpp\n@@ -0,0 +1,111 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2024, Ideas On Board\n+ * Copyright (C) 2024-2025, Red Hat Inc.\n+ *\n+ * Common image adjustments\n+ */\n+\n+#include \"adjust.h\"\n+\n+#include <libcamera/base/log.h>\n+#include <libcamera/base/utils.h>\n+\n+#include <libcamera/control_ids.h>\n+\n+#include \"libcamera/internal/matrix.h\"\n+\n+namespace libcamera {\n+\n+namespace ipa::soft::algorithms {\n+\n+LOG_DEFINE_CATEGORY(IPASoftAdjust)\n+\n+int Adjust::init(IPAContext &context, [[maybe_unused]] const YamlObject &tuningData)\n+{\n+\tif (context.ccmEnabled)\n+\t\tcontext.ctrlMap[&controls::Saturation] = ControlInfo(0.0f, 2.0f, 1.0f);\n+\treturn 0;\n+}\n+\n+int Adjust::configure(IPAContext &context,\n+\t\t [[maybe_unused]] const IPAConfigInfo &configInfo)\n+{\n+\tcontext.activeState.knobs.saturation = std::optional<double>();\n+\tcontext.activeState.correctionMatrix =\n+\t\tMatrix<float, 3, 3>{ { 1, 0, 0, 0, 1, 0, 0, 0, 1 } };\n+\n+\treturn 0;\n+}\n+\n+void Adjust::queueRequest(typename Module::Context &context,\n+\t\t\t [[maybe_unused]] const uint32_t frame,\n+\t\t\t [[maybe_unused]] typename Module::FrameContext &frameContext,\n+\t\t\t const ControlList &controls)\n+{\n+\tconst auto &saturation = controls.get(controls::Saturation);\n+\tif (saturation.has_value()) {\n+\t\tcontext.activeState.knobs.saturation = saturation;\n+\t\tLOG(IPASoftAdjust, Debug) << \"Setting saturation to \" << saturation.value();\n+\t}\n+}\n+\n+void Adjust::applySaturation(Matrix<float, 3, 3> &matrix, float saturation)\n+{\n+\t/* https://en.wikipedia.org/wiki/YCbCr#ITU-R_BT.601_conversion */\n+\tconst Matrix<float, 3, 3> rgb2ycbcr{\n+\t\t{ 0.256788235294, 0.504129411765, 0.0979058823529,\n+\t\t -0.148223529412, -0.290992156863, 0.439215686275,\n+\t\t 0.439215686275, -0.367788235294, -0.0714274509804 }\n+\t};\n+\tconst Matrix<float, 3, 3> ycbcr2rgb{\n+\t\t{ 1.16438356164, 0, 1.59602678571,\n+\t\t 1.16438356164, -0.391762290094, -0.812967647235,\n+\t\t 1.16438356164, 2.01723214285, 0 }\n+\t};\n+\tconst Matrix<float, 3, 3> saturationMatrix{\n+\t\t{ 1, 0, 0,\n+\t\t 0, saturation, 0,\n+\t\t 0, 0, saturation }\n+\t};\n+\tmatrix =\n+\t\tycbcr2rgb * saturationMatrix * rgb2ycbcr * matrix;\n+}\n+\n+void Adjust::prepare(IPAContext &context,\n+\t\t const uint32_t frame,\n+\t\t IPAFrameContext &frameContext,\n+\t\t [[maybe_unused]] DebayerParams *params)\n+{\n+\tif (!context.ccmEnabled)\n+\t\treturn;\n+\n+\tauto &saturation = context.activeState.knobs.saturation;\n+\n+\tif (frame > 0 && saturation == lastSaturation_)\n+\t\treturn;\n+\n+\tcontext.activeState.correctionMatrix = context.activeState.ccm;\n+\tcontext.activeState.matrixChanged = true;\n+\tlastSaturation_ = saturation;\n+\tif (saturation)\n+\t\tapplySaturation(context.activeState.correctionMatrix, saturation.value());\n+\n+\tframeContext.saturation = saturation;\n+}\n+\n+void Adjust::process([[maybe_unused]] IPAContext &context,\n+\t\t [[maybe_unused]] const uint32_t frame,\n+\t\t IPAFrameContext &frameContext,\n+\t\t [[maybe_unused]] const SwIspStats *stats,\n+\t\t ControlList &metadata)\n+{\n+\tconst auto &saturation = frameContext.saturation;\n+\tmetadata.set(controls::Saturation, saturation.value_or(1.0));\n+}\n+\n+REGISTER_IPA_ALGORITHM(Adjust, \"Adjust\")\n+\n+} /* namespace ipa::soft::algorithms */\n+\n+} /* namespace libcamera */\ndiff --git a/src/ipa/simple/algorithms/adjust.h b/src/ipa/simple/algorithms/adjust.h\nnew file mode 100644\nindex 000000000..c4baa2503\n--- /dev/null\n+++ b/src/ipa/simple/algorithms/adjust.h\n@@ -0,0 +1,52 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2024-2025, Red Hat Inc.\n+ *\n+ * Color correction matrix\n+ */\n+\n+#pragma once\n+\n+#include <optional>\n+\n+#include \"libcamera/internal/matrix.h\"\n+\n+#include <libipa/interpolator.h>\n+\n+#include \"algorithm.h\"\n+\n+namespace libcamera {\n+\n+namespace ipa::soft::algorithms {\n+\n+class Adjust : public Algorithm\n+{\n+public:\n+\tAdjust() = default;\n+\t~Adjust() = default;\n+\n+\tint init(IPAContext &context, const YamlObject &tuningData) override;\n+\tint configure(IPAContext &context,\n+\t\t const IPAConfigInfo &configInfo) override;\n+\tvoid queueRequest(typename Module::Context &context,\n+\t\t\t const uint32_t frame,\n+\t\t\t typename Module::FrameContext &frameContext,\n+\t\t\t const ControlList &controls) override;\n+\tvoid prepare(IPAContext &context,\n+\t\t const uint32_t frame,\n+\t\t IPAFrameContext &frameContext,\n+\t\t DebayerParams *params) override;\n+\tvoid process(IPAContext &context, const uint32_t frame,\n+\t\t IPAFrameContext &frameContext,\n+\t\t const SwIspStats *stats,\n+\t\t ControlList &metadata) override;\n+\n+private:\n+\tvoid applySaturation(Matrix<float, 3, 3> &ccm, float saturation);\n+\n+\tstd::optional<float> lastSaturation_;\n+};\n+\n+} /* namespace ipa::soft::algorithms */\n+\n+} /* namespace libcamera */\ndiff --git a/src/ipa/simple/algorithms/ccm.cpp b/src/ipa/simple/algorithms/ccm.cpp\nindex 3e9528a91..c541ef466 100644\n--- a/src/ipa/simple/algorithms/ccm.cpp\n+++ b/src/ipa/simple/algorithms/ccm.cpp\n@@ -3,7 +3,7 @@\n * Copyright (C) 2024, Ideas On Board\n * Copyright (C) 2024-2025, Red Hat Inc.\n *\n- * Color correction matrix + saturation\n+ * Color correction matrix\n */\n \n #include \"ccm.h\"\n@@ -37,76 +37,27 @@ int Ccm::init([[maybe_unused]] IPAContext &context, const YamlObject &tuningData\n \t}\n \n \tcontext.ccmEnabled = true;\n-\tcontext.ctrlMap[&controls::Saturation] = ControlInfo(0.0f, 2.0f, 1.0f);\n \n \treturn 0;\n }\n \n-int Ccm::configure(IPAContext &context,\n-\t\t [[maybe_unused]] const IPAConfigInfo &configInfo)\n-{\n-\tcontext.activeState.knobs.saturation = std::optional<double>();\n-\n-\treturn 0;\n-}\n-\n-void Ccm::queueRequest(typename Module::Context &context,\n-\t\t [[maybe_unused]] const uint32_t frame,\n-\t\t [[maybe_unused]] typename Module::FrameContext &frameContext,\n-\t\t const ControlList &controls)\n-{\n-\tconst auto &saturation = controls.get(controls::Saturation);\n-\tif (saturation.has_value()) {\n-\t\tcontext.activeState.knobs.saturation = saturation;\n-\t\tLOG(IPASoftCcm, Debug) << \"Setting saturation to \" << saturation.value();\n-\t}\n-}\n-\n-void Ccm::applySaturation(Matrix<float, 3, 3> &ccm, float saturation)\n-{\n-\t/* https://en.wikipedia.org/wiki/YCbCr#ITU-R_BT.601_conversion */\n-\tconst Matrix<float, 3, 3> rgb2ycbcr{\n-\t\t{ 0.256788235294, 0.504129411765, 0.0979058823529,\n-\t\t -0.148223529412, -0.290992156863, 0.439215686275,\n-\t\t 0.439215686275, -0.367788235294, -0.0714274509804 }\n-\t};\n-\tconst Matrix<float, 3, 3> ycbcr2rgb{\n-\t\t{ 1.16438356164, 0, 1.59602678571,\n-\t\t 1.16438356164, -0.391762290094, -0.812967647235,\n-\t\t 1.16438356164, 2.01723214285, 0 }\n-\t};\n-\tconst Matrix<float, 3, 3> saturationMatrix{\n-\t\t{ 1, 0, 0,\n-\t\t 0, saturation, 0,\n-\t\t 0, 0, saturation }\n-\t};\n-\tccm = ycbcr2rgb * saturationMatrix * rgb2ycbcr * ccm;\n-}\n-\n void Ccm::prepare(IPAContext &context, const uint32_t frame,\n \t\t IPAFrameContext &frameContext, [[maybe_unused]] DebayerParams *params)\n {\n-\tauto &saturation = context.activeState.knobs.saturation;\n-\n \tconst unsigned int ct = context.activeState.awb.temperatureK;\n \n-\t/* Change CCM only on saturation or bigger temperature changes. */\n+\t/* Change CCM only on bigger temperature changes. */\n \tif (frame > 0 &&\n-\t utils::abs_diff(ct, lastCt_) < kTemperatureThreshold &&\n-\t saturation == lastSaturation_) {\n+\t utils::abs_diff(ct, lastCt_) < kTemperatureThreshold) {\n \t\tframeContext.ccm = context.activeState.ccm;\n \t\treturn;\n \t}\n \n \tlastCt_ = ct;\n-\tlastSaturation_ = saturation;\n \tMatrix<float, 3, 3> ccm = ccm_.getInterpolated(ct);\n-\tif (saturation)\n-\t\tapplySaturation(ccm, saturation.value());\n \n \tcontext.activeState.correctionMatrix = ccm;\n \tcontext.activeState.ccm = ccm;\n-\tframeContext.saturation = saturation;\n \tcontext.activeState.matrixChanged = true;\n \tframeContext.ccm = ccm;\n }\n@@ -118,9 +69,6 @@ void Ccm::process([[maybe_unused]] IPAContext &context,\n \t\t ControlList &metadata)\n {\n \tmetadata.set(controls::ColourCorrectionMatrix, frameContext.ccm.data());\n-\n-\tconst auto &saturation = frameContext.saturation;\n-\tmetadata.set(controls::Saturation, saturation.value_or(1.0));\n }\n \n REGISTER_IPA_ALGORITHM(Ccm, \"Ccm\")\ndiff --git a/src/ipa/simple/algorithms/ccm.h b/src/ipa/simple/algorithms/ccm.h\nindex 8279a3d59..10c9829f5 100644\n--- a/src/ipa/simple/algorithms/ccm.h\n+++ b/src/ipa/simple/algorithms/ccm.h\n@@ -26,12 +26,6 @@ public:\n \t~Ccm() = default;\n \n \tint init(IPAContext &context, const YamlObject &tuningData) override;\n-\tint configure(IPAContext &context,\n-\t\t const IPAConfigInfo &configInfo) override;\n-\tvoid queueRequest(typename Module::Context &context,\n-\t\t\t const uint32_t frame,\n-\t\t\t typename Module::FrameContext &frameContext,\n-\t\t\t const ControlList &controls) override;\n \tvoid prepare(IPAContext &context,\n \t\t const uint32_t frame,\n \t\t IPAFrameContext &frameContext,\n@@ -42,11 +36,9 @@ public:\n \t\t ControlList &metadata) override;\n \n private:\n-\tvoid applySaturation(Matrix<float, 3, 3> &ccm, float saturation);\n-\n \tunsigned int lastCt_;\n-\tstd::optional<float> lastSaturation_;\n \tInterpolator<Matrix<float, 3, 3>> ccm_;\n+\tMatrix<float, 3, 3> lastCcm_;\n };\n \n } /* namespace ipa::soft::algorithms */\ndiff --git a/src/ipa/simple/algorithms/meson.build b/src/ipa/simple/algorithms/meson.build\nindex 2d0adb059..ebe9f20dd 100644\n--- a/src/ipa/simple/algorithms/meson.build\n+++ b/src/ipa/simple/algorithms/meson.build\n@@ -1,6 +1,7 @@\n # SPDX-License-Identifier: CC0-1.0\n \n soft_simple_ipa_algorithms = files([\n+ 'adjust.cpp',\n 'awb.cpp',\n 'agc.cpp',\n 'blc.cpp',\ndiff --git a/src/ipa/simple/data/uncalibrated.yaml b/src/ipa/simple/data/uncalibrated.yaml\nindex 5508e6686..f0410fe61 100644\n--- a/src/ipa/simple/data/uncalibrated.yaml\n+++ b/src/ipa/simple/data/uncalibrated.yaml\n@@ -14,6 +14,7 @@ algorithms:\n # ccm: [ 1, 0, 0,\n # 0, 1, 0,\n # 0, 0, 1]\n+ - Adjust:\n - Lut:\n - Agc:\n ...\n", "prefixes": [ "RFC", "6/7" ] }