Patch Detail
Show a patch.
GET /api/1.1/patches/27314/?format=api
{ "id": 27314, "url": "https://patchwork.libcamera.org/api/1.1/patches/27314/?format=api", "web_url": "https://patchwork.libcamera.org/patch/27314/", "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": "<20260708-libipa-algorithms-v5-6-0759d0359f52@ideasonboard.com>", "date": "2026-07-08T15:50:48", "name": "[v5,06/36] ipa: simple: Use libipa CcmAlgorithm", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "23eb26e98e3dd7155ef94c963fac0118c1eee7c0", "submitter": { "id": 143, "url": "https://patchwork.libcamera.org/api/1.1/people/143/?format=api", "name": "Jacopo Mondi", "email": "jacopo.mondi@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/27314/mbox/", "series": [ { "id": 6048, "url": "https://patchwork.libcamera.org/api/1.1/series/6048/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=6048", "date": "2026-07-08T15:50:42", "name": "ipa: libipa: Introduce libipa algorithms", "version": 5, "mbox": "https://patchwork.libcamera.org/series/6048/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/27314/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/27314/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 85A74C3261\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 8 Jul 2026 15:51:28 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 755D3660E6;\n\tWed, 8 Jul 2026 17:51:24 +0200 (CEST)", "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 DEE03660AB\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 8 Jul 2026 17:51:13 +0200 (CEST)", "from [192.168.1.182] (93-46-82-201.ip106.fastwebnet.it\n\t[93.46.82.201])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 03FA31C94;\n\tWed, 8 Jul 2026 17:50:23 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"APK7YZRW\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1783525824;\n\tbh=tNSoqcW8/apEIrBh9kAAY6iv6Q4lrCS2K5o5rQ0PL+Y=;\n\th=From:Date:Subject:References:In-Reply-To:To:Cc:From;\n\tb=APK7YZRW4REhaeq3bkvaFd8ACiu/KtkkFOirtpvmH5cOV78ONikK7yg8jym2bKTn6\n\tKkMvI/jmiMQhiqopfd/FXTa/+HmM007qVftGmM39ie71M8np6lKmTv1j33zr9Qmm2S\n\tyF6vjdA7NxQnizTTYBuVZhHFUGt287kd5ohQmxJo=", "From": "Jacopo Mondi <jacopo.mondi@ideasonboard.com>", "Date": "Wed, 08 Jul 2026 17:50:48 +0200", "Subject": "[PATCH v5 06/36] ipa: simple: Use libipa CcmAlgorithm", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "7bit", "Message-Id": "<20260708-libipa-algorithms-v5-6-0759d0359f52@ideasonboard.com>", "References": "<20260708-libipa-algorithms-v5-0-0759d0359f52@ideasonboard.com>", "In-Reply-To": "<20260708-libipa-algorithms-v5-0-0759d0359f52@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org, \n\tStefan Klug <stefan.klug@ideasonboard.com>", "Cc": "Jacopo Mondi <jacopo.mondi@ideasonboard.com>, \n\tKieran Bingham <kieran.bingham@ideasonboard.com>, \n\tRobert Mader <robert.mader@collabora.com>", "X-Mailer": "b4 0.14.3", "X-Developer-Signature": "v=1; a=openpgp-sha256; l=6161;\n\ti=jacopo.mondi@ideasonboard.com; h=from:subject:message-id;\n\tbh=4RB8F20OAh55bZc/z6C6O4lhhVyZ0OlK/hVmRwh/ACo=;\n\tb=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBqTnHh17qTD58+O9TJobkLhaR+n2Lt95ZKId9sM\n\tnkoPgtATHOJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCak5x4QAKCRByNAaPFqFW\n\tPMLgEADGPS/CUeaLAsZ2YM6O9TWRNCIsqP7qDsmafXG9B33jPU0gWg8hbgFueIZoK3wsUwZE0pU\n\tL7JXNvZU1l3TV3IgFtucN90ADycJRXTG3Fyf+7SCLgyYvDu1/GfHoh3fS+xwp6Uu/HLEq06AIAf\n\tHseEbSWcNhNI/njJZHG9uPXGQ54sCcJDhUzyaXwvHttFUG4y7X9ybPH5IcJiVASJ0j6uqm5XOc7\n\t9/4JnwAKnzLaP2W+Km6IafoM72l3ozEswyV6trWa3/UTzDv1cZZwrRaGm6xY9Ur1rJWJRIMISzc\n\tPKS+rPDu1ivX7h0L+xCnh+ATp51r9CrAEySJTsGr5bJyh4JM2aGWzRPdeI35C/FSADeyHjp7taw\n\tDloXkS3f7ASNLTvTMZoG8aWfGSQlem9IVu15SPLVy8qds52wwKhVg+o+QKQ1Bzl0voMQy68EhLI\n\tTrATh9Y1d+bzrTUYiyDnV5WFq9s7kBHTU2LBQ6pSLYrS4by6LnKCFwtYW+zB3MzoxoPFNT5DUXu\n\ta7d8R1WYaacb00dOWUoKqXq8N/i6vDb/nokdaRhTL9/ZXhdVMKG9toK0Nlf201Z9sYvolOgv6GG\n\tZoDzko1y+s+NhSEaXLBMC/1a0QUcQz9kEq9iJkky7YEO4eV0fWdXCV9V+Rb5eANmRt2OkFMEhVZ\n\tJuO766Ymfz1Izog==", "X-Developer-Key": "i=jacopo.mondi@ideasonboard.com; a=openpgp;\n\tfpr=72392EDC88144A65C701EA9BA5826A2587AD026B", "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": "From: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\nNow that libipa provides a common CCM algorithm implementation,\nreplace the custom handling with the common Ccm.\n\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nSigned-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\nTested-by: Robert Mader <robert.mader@collabora.com>\n---\n src/ipa/simple/algorithms/ccm.cpp | 72 ++++++++++++++++++++++-----------------\n src/ipa/simple/algorithms/ccm.h | 23 ++++++++-----\n src/ipa/simple/ipa_context.h | 5 +--\n 3 files changed, 58 insertions(+), 42 deletions(-)", "diff": "diff --git a/src/ipa/simple/algorithms/ccm.cpp b/src/ipa/simple/algorithms/ccm.cpp\nindex 1174784edc7e..c6f270825913 100644\n--- a/src/ipa/simple/algorithms/ccm.cpp\n+++ b/src/ipa/simple/algorithms/ccm.cpp\n@@ -8,54 +8,64 @@\n \n #include \"ccm.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 {\n-\n-constexpr unsigned int kTemperatureThreshold = 100;\n-\n-}\n-\n namespace libcamera {\n \n namespace ipa::soft::algorithms {\n \n LOG_DEFINE_CATEGORY(IPASoftCcm)\n \n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::init\n+ */\n int Ccm::init([[maybe_unused]] IPAContext &context, const ValueNode &tuningData)\n {\n-\tint ret = ccm_.readYaml(tuningData[\"ccms\"], \"ct\", \"ccm\");\n-\tif (ret < 0) {\n-\t\tLOG(IPASoftCcm, Error)\n-\t\t\t<< \"Failed to parse 'ccm' parameter from tuning file.\";\n-\t\treturn ret;\n-\t}\n-\n+\t/* Informs the 'adjust' component that CCM is available to apply Saturation */\n \tcontext.ccmEnabled = true;\n \n-\treturn 0;\n+\treturn ccmAlgo_.init(tuningData, context.ctrlMap);\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+ * \\copydoc libcamera::ipa::Algorithm::configure\n+ */\n+int Ccm::configure(IPAContext &context,\n+\t\t [[maybe_unused]] const IPAConfigInfo &configInfo)\n {\n-\tconst unsigned int ct = frameContext.awb.colourTemperature;\n+\treturn ccmAlgo_.configure(context.activeState.ccm,\n+\t\t\t\t context.activeState.awb.automatic.colourTemperature);\n+}\n \n-\t/* Change CCM only on bigger temperature changes. */\n-\tif (!currentCcm_ ||\n-\t utils::abs_diff(ct, lastCt_) >= kTemperatureThreshold) {\n-\t\tcurrentCcm_ = ccm_.getInterpolated(ct);\n-\t\tlastCt_ = ct;\n-\t}\n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::queueRequest\n+ */\n+void Ccm::queueRequest(IPAContext &context,\n+\t\t [[maybe_unused]] const uint32_t frame,\n+\t\t IPAFrameContext &frameContext,\n+\t\t const ControlList &controls)\n+{\n+\t/* Nothing to do here, the ccm will be calculated in prepare() */\n+\tif (frameContext.awb.autoEnabled)\n+\t\treturn;\n \n+\tccmAlgo_.queueRequest(context.activeState.ccm, frameContext.ccm, controls);\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+\tif (frameContext.awb.autoEnabled)\n+\t\tccmAlgo_.prepare(context.activeState.ccm, frameContext.ccm,\n+\t\t\t\t frame, frameContext.awb.colourTemperature);\n+\n+\t/*\n+\t * \\todo: Split out combined matrix into individual parameters in\n+\t * DebayerParams and perform any pre-multiplication combination in the\n+\t * SoftISP component directly.\n+\t */\n \tcontext.activeState.combinedMatrix =\n-\t\tcurrentCcm_.value() * context.activeState.combinedMatrix;\n-\tframeContext.ccm = currentCcm_.value();\n+\t\tframeContext.ccm.ccm * context.activeState.combinedMatrix;\n }\n \n void Ccm::process([[maybe_unused]] IPAContext &context,\n@@ -64,7 +74,7 @@ void Ccm::process([[maybe_unused]] IPAContext &context,\n \t\t [[maybe_unused]] const SwIspStats *stats,\n \t\t ControlList &metadata)\n {\n-\tmetadata.set(controls::ColourCorrectionMatrix, frameContext.ccm.data());\n+\tccmAlgo_.process(frameContext.ccm, metadata);\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 b20a7da8aa33..0d35347ea583 100644\n--- a/src/ipa/simple/algorithms/ccm.h\n+++ b/src/ipa/simple/algorithms/ccm.h\n@@ -7,13 +7,15 @@\n \n #pragma once\n \n-#include <optional>\n+#include <libcamera/controls.h>\n \n-#include \"libcamera/internal/matrix.h\"\n+#include \"libcamera/internal/value_node.h\"\n \n-#include <libipa/interpolator.h>\n+#include \"libipa/ccm.h\"\n+#include \"libipa/fixedpoint.h\"\n \n #include \"algorithm.h\"\n+#include \"ipa_context.h\"\n \n namespace libcamera {\n \n@@ -22,10 +24,15 @@ namespace ipa::soft::algorithms {\n class Ccm : public Algorithm\n {\n public:\n-\tCcm() = default;\n-\t~Ccm() = default;\n-\n \tint init(IPAContext &context, const ValueNode &tuningData) override;\n+\n+\tint configure(IPAContext &context, const IPAConfigInfo &configInfo) override;\n+\n+\tvoid queueRequest(IPAContext &context,\n+\t\t\t [[maybe_unused]] const uint32_t frame,\n+\t\t\t IPAFrameContext &frameContext,\n+\t\t\t const ControlList &controls) override;\n+\n \tvoid prepare(IPAContext &context,\n \t\t const uint32_t frame,\n \t\t IPAFrameContext &frameContext,\n@@ -36,9 +43,7 @@ public:\n \t\t ControlList &metadata) override;\n \n private:\n-\tunsigned int lastCt_;\n-\tInterpolator<Matrix<float, 3, 3>> ccm_;\n-\tstd::optional<Matrix<float, 3, 3>> currentCcm_;\n+\tCcmAlgorithm<Q<4, 16>> ccmAlgo_;\n };\n \n } /* namespace ipa::soft::algorithms */\ndiff --git a/src/ipa/simple/ipa_context.h b/src/ipa/simple/ipa_context.h\nindex 29643a655ce1..ff312ae8f4e7 100644\n--- a/src/ipa/simple/ipa_context.h\n+++ b/src/ipa/simple/ipa_context.h\n@@ -17,6 +17,7 @@\n #include \"libcamera/internal/vector.h\"\n \n #include <libipa/awb.h>\n+#include <libipa/ccm.h>\n #include <libipa/fc_queue.h>\n \n #include \"core_ipa_interface.h\"\n@@ -38,6 +39,7 @@ struct IPASessionConfiguration {\n \n struct IPAActiveState {\n \tipa::awb::ActiveState awb;\n+\tipa::ccm::ActiveState ccm;\n \n \tstruct {\n \t\tint32_t exposure;\n@@ -63,8 +65,7 @@ struct IPAActiveState {\n \n struct IPAFrameContext : public FrameContext {\n \tipa::awb::FrameContext awb;\n-\n-\tMatrix<float, 3, 3> ccm;\n+\tipa::ccm::FrameContext ccm;\n \n \tstruct {\n \t\tint32_t exposure;\n", "prefixes": [ "v5", "06/36" ] }