{"id":25772,"url":"https://patchwork.libcamera.org/api/patches/25772/?format=json","web_url":"https://patchwork.libcamera.org/patch/25772/","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":"<20260114113016.25162-8-mzamazal@redhat.com>","date":"2026-01-14T11:30:09","name":"[v3,07/14] libcamera: ipa: simple: Separate saturation from CCM","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"b0400beea1a467b9b0e28f448754d222d89da970","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/25772/mbox/","series":[{"id":5706,"url":"https://patchwork.libcamera.org/api/series/5706/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5706","date":"2026-01-14T11:30:02","name":"Simple pipeline IPA cleanup","version":3,"mbox":"https://patchwork.libcamera.org/series/5706/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/25772/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/25772/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 75AD4C3226\n\tfor ;\n\tWed, 14 Jan 2026 11:31:00 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 220C461FC3;\n\tWed, 14 Jan 2026 12:31:00 +0100 (CET)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E538D61FBF\n\tfor ;\n\tWed, 14 Jan 2026 12:30:56 +0100 (CET)","from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-349-lhMQdrqfM8quPkQoXRJ8Ng-1;\n\tWed, 14 Jan 2026 06:30:52 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id CA79218003FD; Wed, 14 Jan 2026 11:30:51 +0000 (UTC)","from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.32.217])\n\tby mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 4366D18004D8; Wed, 14 Jan 2026 11:30:49 +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=\"gtjw1IaM\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1768390256;\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=2Yy0fw8VfTVLNbHji1K0yrA439XKw8Ne3cOSiUOGLic=;\n\tb=gtjw1IaMrUPJZKqy5bbR2ADrY/6rkosCUXHcxzNvuLoIQ4vJQPcFPCd5FhYWF9DwJ4L4u4\n\tS8bm91MVi9ufEifiEL9KsuSbGW0gqnL4w2CGJ3QkGWO5RTDC7KPGPS5ErgO8UYo0FtL5FN\n\tVERDKYxHSOZbVeXLiIRT3REPpl1EXNQ=","X-MC-Unique":"lhMQdrqfM8quPkQoXRJ8Ng-1","X-Mimecast-MFC-AGG-ID":"lhMQdrqfM8quPkQoXRJ8Ng_1768390251","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal , Kieran Bingham\n\t, =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?=\n\t","Subject":"[PATCH v3 07/14] libcamera: ipa: simple: Separate saturation from\n\tCCM","Date":"Wed, 14 Jan 2026 12:30:09 +0100","Message-ID":"<20260114113016.25162-8-mzamazal@redhat.com>","In-Reply-To":"<20260114113016.25162-1-mzamazal@redhat.com>","References":"<20260114113016.25162-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":"SHDCrj2mhIqAokKbfJXDWdg3bh5mQ6aK25YcftYr3-U_1768390251","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":"","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":"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\nReviewed-by: Kieran Bingham \nSigned-off-by: Milan Zamazal \n---\n src/ipa/simple/algorithms/adjust.cpp | 106 ++++++++++++++++++++++++++\n src/ipa/simple/algorithms/adjust.h | 52 +++++++++++++\n src/ipa/simple/algorithms/ccm.cpp | 58 +-------------\n src/ipa/simple/algorithms/ccm.h | 9 ---\n src/ipa/simple/algorithms/meson.build | 1 +\n src/ipa/simple/data/uncalibrated.yaml | 1 +\n 6 files changed, 163 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..8ce0631e4\n--- /dev/null\n+++ b/src/ipa/simple/algorithms/adjust.cpp\n@@ -0,0 +1,106 @@\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 \n+#include \n+\n+#include \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();\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 &matrix, float saturation)\n+{\n+\t/* https://en.wikipedia.org/wiki/YCbCr#ITU-R_BT.601_conversion */\n+\tconst Matrix 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 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 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 [[maybe_unused]] 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+\tframeContext.saturation = saturation;\n+\tif (saturation)\n+\t\tapplySaturation(context.activeState.combinedMatrix, saturation.value());\n+\n+\tif (saturation != lastSaturation_) {\n+\t\tcontext.activeState.matrixChanged = true;\n+\t\tlastSaturation_ = saturation;\n+\t}\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 \n+\n+#include \"libcamera/internal/matrix.h\"\n+\n+#include \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 &ccm, float saturation);\n+\n+\tstd::optional 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 8992a8ee1..1b2c6eb3a 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();\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 &ccm, float saturation)\n-{\n-\t/* https://en.wikipedia.org/wiki/YCbCr#ITU-R_BT.601_conversion */\n-\tconst Matrix 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 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 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, [[maybe_unused]] 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 (!ccmAssigned_ ||\n-\t utils::abs_diff(ct, lastCt_) >= kTemperatureThreshold ||\n-\t saturation != lastSaturation_) {\n+\t utils::abs_diff(ct, lastCt_) >= kTemperatureThreshold) {\n \t\tcurrentCcm_ = ccm_.getInterpolated(ct);\n \t\tccmAssigned_ = true;\n-\t\tif (saturation)\n-\t\t\tapplySaturation(currentCcm_, saturation.value());\n \t\tlastCt_ = ct;\n-\t\tlastSaturation_ = saturation;\n \t\tcontext.activeState.matrixChanged = true;\n \t}\n \n \tcontext.activeState.combinedMatrix =\n \t\tcurrentCcm_ * context.activeState.combinedMatrix;\n \tcontext.activeState.ccm = currentCcm_;\n-\tframeContext.saturation = saturation;\n \tframeContext.ccm = currentCcm_;\n }\n \n@@ -117,9 +68,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 19bf283af..261c2c371 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,10 +36,7 @@ public:\n \t\t ControlList &metadata) override;\n \n private:\n-\tvoid applySaturation(Matrix &ccm, float saturation);\n-\n \tunsigned int lastCt_;\n-\tstd::optional lastSaturation_;\n \tInterpolator> ccm_;\n \tMatrix currentCcm_;\n \tbool ccmAssigned_ = false;\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 8b6df9afc..e389e0588 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":["v3","07/14"]}