Patch Detail
Show a patch.
GET /api/1.1/patches/26884/?format=api
{ "id": 26884, "url": "https://patchwork.libcamera.org/api/1.1/patches/26884/?format=api", "web_url": "https://patchwork.libcamera.org/patch/26884/", "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": "<20260615-libipa-algorithms-v1-7-e949c937422e@ideasonboard.com>", "date": "2026-06-15T14:05:32", "name": "[07/11] ipa: simple: Use libipa CcmAlgorithm", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "f35ada9107d3d46808c5f6cc06a0f294770da28c", "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/26884/mbox/", "series": [ { "id": 5992, "url": "https://patchwork.libcamera.org/api/1.1/series/5992/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5992", "date": "2026-06-15T14:05:25", "name": "ipa: libipa: Introduce libipa algorithms", "version": 1, "mbox": "https://patchwork.libcamera.org/series/5992/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/26884/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/26884/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 047F9C324C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 15 Jun 2026 14:06:05 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CDCC1623FF;\n\tMon, 15 Jun 2026 16:05:59 +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 C9061623E9\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 15 Jun 2026 16:05:48 +0200 (CEST)", "from [192.168.1.104] (net-93-65-100-155.cust.vodafonedsl.it\n\t[93.65.100.155])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 05EFEAB4;\n\tMon, 15 Jun 2026 16:05:15 +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=\"VRyIxMGG\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1781532316;\n\tbh=CO1uyBJUO35HKWOabimLdIvmHaBVEqqV61H91F6gH+Y=;\n\th=From:Date:Subject:References:In-Reply-To:To:Cc:From;\n\tb=VRyIxMGGqJdkT+wdpiAj41T3tsKrwNfn517I2OVpTrXxghGhaSIjN8CQF8drqVdTh\n\tphxgnGflo6ubgEUUQdp8YZv359l1ms9wkR7EFwWDCbnD4o+ECqViYp0+17Dasd29T8\n\tsxgRZuMePEbfQmlhjLGPdTQV+NosNqCQd6etCemc=", "From": "Jacopo Mondi <jacopo.mondi@ideasonboard.com>", "Date": "Mon, 15 Jun 2026 16:05:32 +0200", "Subject": "[PATCH 07/11] ipa: simple: Use libipa CcmAlgorithm", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "7bit", "Message-Id": "<20260615-libipa-algorithms-v1-7-e949c937422e@ideasonboard.com>", "References": "<20260615-libipa-algorithms-v1-0-e949c937422e@ideasonboard.com>", "In-Reply-To": "<20260615-libipa-algorithms-v1-0-e949c937422e@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Jacopo Mondi <jacopo.mondi@ideasonboard.com>, \n\tKieran Bingham <kieran.bingham@ideasonboard.com>", "X-Mailer": "b4 0.14.3", "X-Developer-Signature": "v=1; a=openpgp-sha256; l=5853;\n\ti=jacopo.mondi@ideasonboard.com; h=from:subject:message-id;\n\tbh=lh02C6rkWqTUA9wW6cSugRorHYlriBx9qqmGyTJ+Zhk=;\n\tb=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBqMAa5SqsbG+pZoDJjiUTQz/WS5HLJ4G5uDXDmK\n\tTcjS74X7ymJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCajAGuQAKCRByNAaPFqFW\n\tPAePD/98DE4RiGQx8gBNwxWq8D3nMav0N1GFAPe5U9BrTJ93Kjpuh+Lw7LlVRT1LloZL+R8HLTf\n\tMcMBtOs/3415pG0KuLIstLDqd++fgFWyaC2EXdCKb9tkjOq41gD+zwiSzDV6eZUMXqc0S92WL21\n\tdfQZCt5Ik0GZIecTbpk9ubeTVjhchcxkQtOYRffQpXXrC0vd1Tp5IgQ+BK9qPO5GW9zJTv7//Wa\n\tGPx7ylPlAV+6iftS7tjpRkUr323Q6zVJficElPPOayIbp7l3EFOOePH9F3xUX+tvbefJUWEYIEy\n\tMeV8t07oAXfK2NywntbyZKPLdM5xd3wUV5v3/l7sVgujrCGLDIkoYVIzIsaLCAm7JrBz+2FDL3U\n\tJCNivfIKkNmgniBnkCiVpGUu5tH83sWVJSmivWalrJoNkqXBqaJ0tRSfjcRbkkANEvT4/Y8Ypcf\n\tUTP65A4DXbxNHag7Q61Ug3VAUZqAkUL2OqwP2p3seud8EDrRbgz8QaGzFd/g2uIVyUUb5535JXB\n\t7h57TkWz39iqjH02xXmmmPmjhkoNf5neEyWdWBr8b/EvYw9+LaTl/fhg/0NMcnqBqhc8QPULIkc\n\tQtpXkeDnjRjcmrgoSwcOXTeb5E/TkmQI4xIvh6Dkf9JfNL/twdJ7eWkxe/6sCI2vXBjsa7ZAPv1\n\t01zOl+yc4mB/GOA==", "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>\n---\n src/ipa/simple/algorithms/ccm.cpp | 69 +++++++++++++++++++++------------------\n src/ipa/simple/algorithms/ccm.h | 23 ++++++++-----\n src/ipa/simple/ipa_context.h | 5 +--\n 3 files changed, 55 insertions(+), 42 deletions(-)", "diff": "diff --git a/src/ipa/simple/algorithms/ccm.cpp b/src/ipa/simple/algorithms/ccm.cpp\nindex ff37c718c6e4..6cf55bd93db0 100644\n--- a/src/ipa/simple/algorithms/ccm.cpp\n+++ b/src/ipa/simple/algorithms/ccm.cpp\n@@ -8,54 +8,61 @@\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+\treturn ccmAlgo_.init(tuningData, context.ctrlMap);\n+}\n+\n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::configure\n+ */\n+int Ccm::configure(IPAContext &context,\n+\t\t [[maybe_unused]] const IPAConfigInfo &configInfo)\n+{\n+\treturn ccmAlgo_.configure(context.activeState.ccm,\n+\t\t\t\t context.activeState.awb.automatic.temperatureK);\n+}\n \n-\tcontext.ccmEnabled = true;\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-\treturn 0;\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-\tconst unsigned int ct = frameContext.awb.temperatureK;\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+\tif (frameContext.awb.autoEnabled)\n+\t\tccmAlgo_.prepare(context.activeState.ccm, frameContext.ccm,\n+\t\t\t\t frame, frameContext.awb.temperatureK);\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 +71,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 0646f42d5618..1b40591e39cb 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@@ -40,6 +41,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@@ -65,8 +67,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": [ "07/11" ] }