{"id":27170,"url":"https://patchwork.libcamera.org/api/patches/27170/?format=json","web_url":"https://patchwork.libcamera.org/patch/27170/","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":"<20260703122543.1991189-12-paul.elder@ideasonboard.com>","date":"2026-07-03T12:25:17","name":"[RFC,11/19] ipa: rkisp2: algo: ccm: Implement color correction matrix","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ffaa11988602ecf2cdf4157fbb790c746c702a87","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/27170/mbox/","series":[{"id":6035,"url":"https://patchwork.libcamera.org/api/series/6035/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=6035","date":"2026-07-03T12:25:06","name":"Add support for rkisp2","version":1,"mbox":"https://patchwork.libcamera.org/series/6035/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/27170/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/27170/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 56C23C328C\n\tfor ;\n\tFri, 3 Jul 2026 12:26:41 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E360B65FE2;\n\tFri, 3 Jul 2026 14:26:40 +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 623C965FD8\n\tfor ;\n\tFri, 3 Jul 2026 14:26:39 +0200 (CEST)","from neptunite.hamster-moth.ts.net (unknown\n\t[IPv6:2404:7a81:160:2100:a2cc:2f45:3bd7:2589])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 854B68E0;\n\tFri, 3 Jul 2026 14:25:50 +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=\"n6WsooLV\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1783081553;\n\tbh=VGh1iqBQr5zsnLh9R5lq1HZjJtvMAW93rS/keKbJcc8=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=n6WsooLVLSjqCsjtksiLY7+AVNnazQgV60SdhWVL9a7ZcOWzlNTOCx3raKU96gDuj\n\tdvUv/k2VOBPCUcIekPg4Dshubkie+DG5U9+OwvOZacDbyJlzDugXWRY3WbxrHIv9yJ\n\t5lMIXECxE8i6h3DT+mHQvp/5mCb0aFlrk4+6Zhkw=","From":"Paul Elder ","To":"laurent.pinchart@ideasonboard.com","Cc":"Paul Elder , michael.riesch@collabora.com, \n\txuhf@rock-chips.com, stefan.klug@ideasonboard.com,\n\tkieran.bingham@ideasonboard.com, dan.scally@ideasonboard.com,\n\tjacopo.mondi@ideasonboard.com, nicolas.dufresne@collabora.com,\n\tlibcamera-devel@lists.libcamera.org","Subject":"[RFC PATCH 11/19] ipa: rkisp2: algo: ccm: Implement color correction\n\tmatrix","Date":"Fri, 3 Jul 2026 21:25:17 +0900","Message-ID":"<20260703122543.1991189-12-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.47.2","In-Reply-To":"<20260703122543.1991189-1-paul.elder@ideasonboard.com>","References":"<20260703122543.1991189-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","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":"Implement a color correction matrix control algorithm for the rkisp2\nIPA. This uses the libipa color correction matrix algorithm.\n\nSigned-off-by: Paul Elder \n---\n src/ipa/rkisp2/algorithms/ccm.cpp | 126 ++++++++++++++++++++++++++\n src/ipa/rkisp2/algorithms/ccm.h | 57 ++++++++++++\n src/ipa/rkisp2/algorithms/meson.build | 1 +\n 3 files changed, 184 insertions(+)\n create mode 100644 src/ipa/rkisp2/algorithms/ccm.cpp\n create mode 100644 src/ipa/rkisp2/algorithms/ccm.h","diff":"diff --git a/src/ipa/rkisp2/algorithms/ccm.cpp b/src/ipa/rkisp2/algorithms/ccm.cpp\nnew file mode 100644\nindex 000000000000..d9630ccf23bd\n--- /dev/null\n+++ b/src/ipa/rkisp2/algorithms/ccm.cpp\n@@ -0,0 +1,126 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2026, Ideas On Board\n+ *\n+ * RkISP2 Color Correction Matrix control algorithm\n+ */\n+\n+#include \"ccm.h\"\n+\n+#include \n+\n+#include \n+#include \n+\n+#include \n+\n+#include \n+\n+#include \"libipa/interpolator.h\"\n+\n+/**\n+ * \\file ccm.h\n+ * \\brief RkISP2 CCM algorithm implementation\n+ */\n+\n+namespace libcamera {\n+\n+namespace ipa::rkisp2::algorithms {\n+\n+/**\n+ * \\class Ccm\n+ * \\brief RkISP2 color correction matrix algorithm\n+ */\n+\n+LOG_DEFINE_CATEGORY(RkISP2Ccm)\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+\tccmAlgo_.queueRequest(context.activeState.ccm, frameContext.ccm, controls);\n+}\n+\n+void Ccm::setParameters(RkISP2Params *params, IPAFrameContext &context)\n+{\n+\tconst Matrix &matrix = context.ccm.ccm;\n+\tconst Matrix &offsets = context.ccm.offsets;\n+\n+\tauto config = params->block();\n+\tconfig.setEnabled(true);\n+\n+\t/*\n+\t * 4 bit integer and 7 bit fractional, ranging from -8 (0x400) to\n+\t * +7.9921875 (0x3ff)\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, 7>(matrix[i][j]).quantized();\n+\t}\n+\n+\tfor (unsigned int i = 0; i < 3; i++)\n+\t\tconfig->offset[i] = offsets[i][0] & 0xfff;\n+\n+\tconfig->y_coeff[0] = 0x26;\n+\tconfig->y_coeff[1] = 0x4b;\n+\tconfig->y_coeff[2] = 0x0f;\n+\tconfig->inflection_point = 0xa;\n+\n+\tfor (unsigned int i = 0; i < 17; i++)\n+\t\tconfig->alp[i] = 0x400;\n+\n+\t/* \\todo Support alp */\n+\n+\tLOG(RkISP2Ccm, Debug) << \"Setting matrix \" << matrix;\n+\tLOG(RkISP2Ccm, 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, RkISP2Params *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 rkisp2_stats_buffer *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::rkisp2::algorithms */\n+\n+} /* namespace libcamera */\ndiff --git a/src/ipa/rkisp2/algorithms/ccm.h b/src/ipa/rkisp2/algorithms/ccm.h\nnew file mode 100644\nindex 000000000000..80a87e1c73d0\n--- /dev/null\n+++ b/src/ipa/rkisp2/algorithms/ccm.h\n@@ -0,0 +1,57 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2026, Ideas On Board\n+ *\n+ * RkISP2 Color Correction Matrix control algorithm\n+ */\n+\n+#pragma once\n+\n+#include \n+\n+#include \n+\n+#include \"libcamera/internal/value_node.h\"\n+\n+#include \"libipa/ccm.h\"\n+#include \"libipa/fixedpoint.h\"\n+\n+#include \"algorithm.h\"\n+#include \"ipa_context.h\"\n+#include \"params.h\"\n+\n+namespace libcamera {\n+\n+namespace ipa::rkisp2::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 RkISP2Params *params) override;\n+\tvoid process(IPAContext &context, const uint32_t frame,\n+\t\t IPAFrameContext &frameContext,\n+\t\t const rkisp2_stats_buffer *stats,\n+\t\t ControlList &metadata) override;\n+\n+private:\n+\tvoid parseYaml(const ValueNode &tuningData);\n+\tvoid setParameters(RkISP2Params *params, IPAFrameContext &context);\n+\n+\tCcmAlgorithm> ccmAlgo_;\n+};\n+\n+} /* namespace ipa::rkisp2::algorithms */\n+\n+} /* namespace libcamera */\ndiff --git a/src/ipa/rkisp2/algorithms/meson.build b/src/ipa/rkisp2/algorithms/meson.build\nindex 027e40dd0346..e7ae3d163bfb 100644\n--- a/src/ipa/rkisp2/algorithms/meson.build\n+++ b/src/ipa/rkisp2/algorithms/meson.build\n@@ -4,5 +4,6 @@ rkisp2_ipa_algorithms = files([\n 'agc.cpp',\n 'awb.cpp',\n 'bls.cpp',\n+ 'ccm.cpp',\n ])\n \n","prefixes":["RFC","11/19"]}