Patch Detail
Show a patch.
GET /api/patches/26929/?format=api
{ "id": 26929, "url": "https://patchwork.libcamera.org/api/patches/26929/?format=api", "web_url": "https://patchwork.libcamera.org/patch/26929/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20260618-rppx1-ipa-v1-14-32337264cfcd@ideasonboard.com>", "date": "2026-06-18T10:18:53", "name": "[14/14] ipa: rppx1: Add Ccm algorithm", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "b1c3884ac50cdb95f798e029f17d2e2da07e811d", "submitter": { "id": 143, "url": "https://patchwork.libcamera.org/api/people/143/?format=api", "name": "Jacopo Mondi", "email": "jacopo.mondi@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/26929/mbox/", "series": [ { "id": 6003, "url": "https://patchwork.libcamera.org/api/series/6003/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=6003", "date": "2026-06-18T10:18:39", "name": "libcamera: Add support for R-Car Gen4 and RPP-X1 ISP", "version": 1, "mbox": "https://patchwork.libcamera.org/series/6003/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/26929/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/26929/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 2A560C3310\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 18 Jun 2026 10:19:16 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 75ED562B32;\n\tThu, 18 Jun 2026 12:19:15 +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 B3210629E3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 18 Jun 2026 12:19:03 +0200 (CEST)", "from [192.168.125.177] (mob-109-113-4-199.net.vodafone.it\n\t[109.113.4.199])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 382212590;\n\tThu, 18 Jun 2026 12:18:28 +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=\"PZPrBhA8\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1781777908;\n\tbh=Uo14V8xv8NdLqXdbwptWsj5GofZHVGzwazfa8t67n2k=;\n\th=From:Date:Subject:References:In-Reply-To:To:Cc:From;\n\tb=PZPrBhA8UTrNMd/90FiqYITcWaQnYlpAnNjuJAb7Ye+HUFD5NvpFKfYFfpXL97AcH\n\taIg0/XYjBDErbApWXPOpjepEFHW4MlMZa6/+KHcU99nt4AzkCx4ynHhP51skH9QPoA\n\tlYurhFBGXSn6SUHTJFfHvzv4sw+SXuKd/O3ANBdw=", "From": "Jacopo Mondi <jacopo.mondi@ideasonboard.com>", "Date": "Thu, 18 Jun 2026 12:18:53 +0200", "Subject": "[PATCH 14/14] ipa: rppx1: Add Ccm algorithm", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "7bit", "Message-Id": "<20260618-rppx1-ipa-v1-14-32337264cfcd@ideasonboard.com>", "References": "<20260618-rppx1-ipa-v1-0-32337264cfcd@ideasonboard.com>", "In-Reply-To": "<20260618-rppx1-ipa-v1-0-32337264cfcd@ideasonboard.com>", "To": "=?utf-8?q?Niklas_S=C3=B6derlund?=\n\t<niklas.soderlund+renesas@ragnatech.se>, \n\tlibcamera-devel@lists.libcamera.org", "Cc": "Jacopo Mondi <jacopo.mondi@ideasonboard.com>", "X-Mailer": "b4 0.14.3", "X-Developer-Signature": "v=1; a=openpgp-sha256; l=8128;\n\ti=jacopo.mondi@ideasonboard.com; h=from:subject:message-id;\n\tbh=Uo14V8xv8NdLqXdbwptWsj5GofZHVGzwazfa8t67n2k=;\n\tb=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBqM8YKJZmZxVQna/U6TvrSg3aw0EiU3i4xZUzoq\n\tRoRQNVlVhiJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCajPGCgAKCRByNAaPFqFW\n\tPDnZD/42Xqm7u6JCysWka4KOGxulySLFsTVAjkfBo9UATq4j81q36L/niTFeZwXRb5a640TSB8u\n\ttklugP4ocQJYx1Mh+BD+oMBB888COW6+rVD4DC/lt+I5dgIzncTwGUvgJ6z1tFR9GgahLbcS7Yh\n\tHttaJU+hjJO5lupFs4q23V4cDXBGJ+KLIKKrF7/9klINev4M4x8EOP//UYc5A9GMqRGWNndM3Rj\n\tjKcQw7/HCtoNbKWaTOWJ0fsBLX6Y4LuTQRLTZgKJ/XsVaLTTWl3B1GCYo5UTrBWoBGYEPbjXxb2\n\tPIjBId/IOgXH/vE1yZm6OE3zXKJN80YuK+Ymv02VkYerjKlfcnZAKb+hseOl6umOQxpShXI4TL1\n\tLHQJS2PQKziWznRiemJhHT/NCNWzB2WLVLUfw4chCVxD4yi6pBim2XwXSUS1KS7lsNybcmJfaGm\n\trf+zMEeR5PXqdhT4SL547dbYrcepiKZNrIpEZxyQoy/BgaxhcJUMHNt+h8k3WUaJ/Um50H7Ty+a\n\t+J5z0NKIso/ChDnYjcjh/SnKFmx9jmCVBdBPk33GZXJV3Txc/1kGIFwzeqeoDNBPylQne9yngkq\n\tNTaYYPuFd5A495lbllmDzVGNFlphGe3ulH34+l1GUjHSyMkIyC+tgnt3ScqJIldH/BXXe2XoKP5\n\t58DAyXICH58MOBQ==", "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": "Add Ccm algorithm to the RPP-X1 IPA.\n\nThe implementation is based on libIPA CcmAlgorithm.\n\nSigned-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\n---\n src/ipa/rppx1/algorithms/awb.cpp | 3 +-\n src/ipa/rppx1/algorithms/ccm.cpp | 124 +++++++++++++++++++++++++++++++++++\n src/ipa/rppx1/algorithms/ccm.h | 54 +++++++++++++++\n src/ipa/rppx1/algorithms/meson.build | 1 +\n src/ipa/rppx1/ipa_context.cpp | 10 +++\n src/ipa/rppx1/ipa_context.h | 3 +\n 6 files changed, 193 insertions(+), 2 deletions(-)", "diff": "diff --git a/src/ipa/rppx1/algorithms/awb.cpp b/src/ipa/rppx1/algorithms/awb.cpp\nindex 6316606b4b0f..598e4503513c 100644\n--- a/src/ipa/rppx1/algorithms/awb.cpp\n+++ b/src/ipa/rppx1/algorithms/awb.cpp\n@@ -275,11 +275,10 @@ RppX1AwbStats Awb::calculateRgbMeans(const IPAFrameContext &frameContext,\n \trgbMeans = rgbMeans.max(0.0);\n \n \t/*\n-\t * \\todo\n \t * The ISP computes the AWB means after applying the CCM. Apply\n \t * the inverse as we want to get the raw means before the colour gains.\n-\t * rgbMeans = frameContext.ccm.ccm.inverse() * rgbMeans;\n \t */\n+\trgbMeans = frameContext.ccm.ccm.inverse() * rgbMeans;\n \n \t/*\n \t * The ISP computes the AWB means after applying the colour gains,\ndiff --git a/src/ipa/rppx1/algorithms/ccm.cpp b/src/ipa/rppx1/algorithms/ccm.cpp\nnew file mode 100644\nindex 000000000000..4b485d1cff0e\n--- /dev/null\n+++ b/src/ipa/rppx1/algorithms/ccm.cpp\n@@ -0,0 +1,124 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2026, Ideas On Board\n+ *\n+ * RPP-X1 color correction matrix control algorithm\n+ */\n+\n+#include \"ccm.h\"\n+\n+#include <linux/media/dreamchip/rppx1-config.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/ipa/core_ipa_interface.h>\n+\n+/**\n+ * \\file ccm.h\n+ */\n+\n+namespace libcamera {\n+\n+namespace ipa::rppx1::algorithms {\n+\n+LOG_DEFINE_CATEGORY(RppX1Ccm)\n+\n+/**\n+ * \\class Ccm\n+ * \\brief Color correction matrix algorithm\n+ */\n+\n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::init\n+ */\n+int Ccm::init([[maybe_unused]] IPAContext &context, const ValueNode &tuningData)\n+{\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 IPACameraSensorInfo &configInfo)\n+{\n+\treturn ccmAlgo_.configure(context.activeState.ccm,\n+\t\t\t\t context.activeState.awb.automatic.temperatureK);\n+}\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::setParameters(RppX1Params *params, IPAFrameContext &context)\n+{\n+\tconst Matrix<float, 3, 3> &matrix = context.ccm.ccm;\n+\tconst Matrix<int16_t, 3, 1> &offsets = context.ccm.offsets;\n+\n+\tauto config = params->block<BlockType::CcorPost>();\n+\tconfig.setEnabled(true);\n+\n+\t/*\n+\t * RPP-X1 coefficients are 16 bits Q4.12 signed fixed-point ranging from\n+\t * -8 (0x8000) to +7.9996 (0x7fff). x1 = 0x1000.\n+\t */\n+\tfor (unsigned int i = 0; i < 3; i++) {\n+\t\tfor (unsigned int j = 0; j < 3; j++)\n+\t\t\tconfig->coeff[i][j] = Q<4, 12>(matrix[i][j]).quantized();\n+\t}\n+\n+\t/*\n+\t * RPP-X1 offsets are 25 bits 2's complement while the CcmAlgorithm\n+\t * class uses int16_t.\n+\t *\n+\t * \\todo: Better investigate how negative offsets are handled in the\n+\t * offsets interpolation.\n+\t */\n+\tfor (unsigned int i = 0; i < 3; i++)\n+\t\tconfig->offset[i] = static_cast<int32_t>(offsets[i][0]);\n+\n+\tLOG(RppX1Ccm, Debug) << \"Setting matrix \" << matrix;\n+\tLOG(RppX1Ccm, Debug) << \"Setting offsets \" << offsets;\n+}\n+\n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::prepare\n+ */\n+void Ccm::prepare(IPAContext &context, const uint32_t frame,\n+\t\t IPAFrameContext &frameContext, RppX1Params *params)\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+\tsetParameters(params, frameContext);\n+}\n+\n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::process\n+ */\n+void Ccm::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 RppX1Stats *stats,\n+\t\t ControlList &metadata)\n+{\n+\tccmAlgo_.process(frameContext.ccm, metadata);\n+}\n+\n+REGISTER_IPA_ALGORITHM(Ccm, \"Ccm\")\n+\n+} /* namespace ipa::rppx1::algorithms */\n+\n+} /* namespace libcamera */\ndiff --git a/src/ipa/rppx1/algorithms/ccm.h b/src/ipa/rppx1/algorithms/ccm.h\nnew file mode 100644\nindex 000000000000..5e183d255a48\n--- /dev/null\n+++ b/src/ipa/rppx1/algorithms/ccm.h\n@@ -0,0 +1,54 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2026, Ideas On Board\n+ *\n+ * RPP-X1 color correction matrix control algorithm\n+ */\n+\n+#pragma once\n+\n+#include \"libcamera/internal/matrix.h\"\n+\n+#include <libipa/ccm.h>\n+\n+#include \"algorithm.h\"\n+\n+namespace libcamera {\n+\n+namespace ipa::rppx1::algorithms {\n+\n+class Ccm : public Algorithm\n+{\n+public:\n+\tCcm() {}\n+\t~Ccm() = default;\n+\n+\tint init(IPAContext &context, const ValueNode &tuningData) override;\n+\tint configure(IPAContext &context,\n+\t\t const IPACameraSensorInfo &configInfo) override;\n+\tvoid queueRequest(IPAContext &context,\n+\t\t\t const uint32_t frame,\n+\t\t\t IPAFrameContext &frameContext,\n+\t\t\t const ControlList &controls) override;\n+\tvoid prepare(IPAContext &context, const uint32_t frame,\n+\t\t IPAFrameContext &frameContext,\n+\t\t RppX1Params *params) override;\n+\tvoid process(IPAContext &context, const uint32_t frame,\n+\t\t IPAFrameContext &frameContext,\n+\t\t const RppX1Stats *stats,\n+\t\t ControlList &metadata) override;\n+\n+private:\n+\tvoid parseYaml(const ValueNode &tuningData);\n+\tvoid setParameters(RppX1Params *params, IPAFrameContext &context);\n+\n+\tunsigned int ct_;\n+\tInterpolator<Matrix<float, 3, 3>> ccm_;\n+\tInterpolator<Matrix<int16_t, 3, 1>> offsets_;\n+\n+\tCcmAlgorithm<Q<4, 12>> ccmAlgo_;\n+};\n+\n+} /* namespace ipa::rppx1::algorithms */\n+\n+} /* namespace libcamera */\ndiff --git a/src/ipa/rppx1/algorithms/meson.build b/src/ipa/rppx1/algorithms/meson.build\nindex 70368ad9bac9..ddebbfbecbee 100644\n--- a/src/ipa/rppx1/algorithms/meson.build\n+++ b/src/ipa/rppx1/algorithms/meson.build\n@@ -2,4 +2,5 @@\n \n rppx1_ipa_algorithms = files([\n 'awb.cpp',\n+ 'ccm.cpp'\n ])\ndiff --git a/src/ipa/rppx1/ipa_context.cpp b/src/ipa/rppx1/ipa_context.cpp\nindex ea7008f5685d..57a2b56774bc 100644\n--- a/src/ipa/rppx1/ipa_context.cpp\n+++ b/src/ipa/rppx1/ipa_context.cpp\n@@ -51,6 +51,11 @@ namespace libcamera::ipa::rppx1 {\n * \\copydoc ipa::awb::ActiveState\n */\n \n+/**\n+ * \\var IPAActiveState::ccm\n+ * \\copydoc ipa::ccm::ActiveState\n+ */\n+\n /**\n * \\struct IPAFrameContext\n * \\brief Per-frame context for algorithms\n@@ -61,6 +66,11 @@ namespace libcamera::ipa::rppx1 {\n * \\copydoc ipa::awb::FrameContext\n */\n \n+/**\n+ * \\var IPAFrameContext::ccm\n+ * \\copydoc ipa::ccm::FrameContext\n+ */\n+\n /**\n * \\struct IPAContext\n * \\brief Global IPA context data shared between all algorithms\ndiff --git a/src/ipa/rppx1/ipa_context.h b/src/ipa/rppx1/ipa_context.h\nindex 57197d865d3f..bba1d10da73f 100644\n--- a/src/ipa/rppx1/ipa_context.h\n+++ b/src/ipa/rppx1/ipa_context.h\n@@ -21,6 +21,7 @@\n #include <libipa/fc_queue.h>\n \n #include \"libipa/awb.h\"\n+#include \"libipa/ccm.h\"\n \n namespace libcamera {\n \n@@ -37,10 +38,12 @@ struct IPASessionConfiguration {\n \n struct IPAActiveState {\n \tipa::awb::ActiveState awb;\n+\tipa::ccm::ActiveState ccm;\n };\n \n struct IPAFrameContext : public FrameContext {\n \tipa::awb::FrameContext awb;\n+\tipa::ccm::FrameContext ccm;\n };\n \n struct IPAContext {\n", "prefixes": [ "14/14" ] }