Patch Detail
Show a patch.
GET /api/patches/26883/?format=api
{ "id": 26883, "url": "https://patchwork.libcamera.org/api/patches/26883/?format=api", "web_url": "https://patchwork.libcamera.org/patch/26883/", "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": "<20260615-libipa-algorithms-v1-6-e949c937422e@ideasonboard.com>", "date": "2026-06-15T14:05:31", "name": "[06/11] ipa: rkisp1: ccm: Port to use CcmAlgorithm", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "562e1624fafe1f88122958d104b479389cf29992", "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/26883/mbox/", "series": [ { "id": 5992, "url": "https://patchwork.libcamera.org/api/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/26883/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/26883/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 14441C32D4\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 15 Jun 2026 14:06:04 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 66A8D623E3;\n\tMon, 15 Jun 2026 16:05:58 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 88028623E5\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 BB1051E2B;\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=\"H3tPig+E\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1781532315;\n\tbh=iCLTTGrtQhxDI3gU4TkO4My19UTY9C00k1cA68SGo7Y=;\n\th=From:Date:Subject:References:In-Reply-To:To:Cc:From;\n\tb=H3tPig+EqMNk4XXt2ayFtnzTw4wljlpDU2hwaBzVFuNzN6nJ+Vcx51PbTsAQoa/tQ\n\tplaFGvuW/j9BrQTc9Kmi2NBqI3vsfKEncFDzFyDxosFKMsVLbVgqQp3Bk41HPwpZVT\n\t5xaaRwijhsTCinZxj7UGDsmorOn2Ls8/lljQ6GCU=", "From": "Jacopo Mondi <jacopo.mondi@ideasonboard.com>", "Date": "Mon, 15 Jun 2026 16:05:31 +0200", "Subject": "[PATCH 06/11] ipa: rkisp1: ccm: Port to use CcmAlgorithm", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "7bit", "Message-Id": "<20260615-libipa-algorithms-v1-6-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>", "X-Mailer": "b4 0.14.3", "X-Developer-Signature": "v=1; a=openpgp-sha256; l=7981;\n\ti=jacopo.mondi@ideasonboard.com; h=from:subject:message-id;\n\tbh=iCLTTGrtQhxDI3gU4TkO4My19UTY9C00k1cA68SGo7Y=;\n\tb=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBqMAa5X0F9upC4yG9eNASUby0DlOnLC6xyicCwZ\n\tmm8Pl9NkDmJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCajAGuQAKCRByNAaPFqFW\n\tPLJvD/4oVuFWm5KRWqQ5a7LPfRdhuf6gsaGzPd5MeCEIrma2JF3tWhR23lDC/OpC9E850nCZOw0\n\t6qvOZ8F/lMw02QTIq+gJYidbQGAjQ+q+fAQPVXJDSZp8De1eYSjoBI1m6tKg6alzE7CPb/w0NAq\n\tf9fBBhQ0o+X9lPfjRBrm6TONbh+1qVrX9YKme6pHQCCBzpTAVO5t+i9luwSSgwD8gv4rilvVjJi\n\tUQSPZzfCtKJQDgi+lgbNa93nC3zcALQhcRO7ugU0RUUQrjD3TfNTlISF5Nsea+Rqr5zYlmoLSjM\n\tSEWVTEQsV8fNeHdsT0ViA9325pPzyuyIFnZVYcXJB60Em4JFyOqd4atigUAssZ1vOpgtVtaWxfI\n\trn/BP4YBZrrzPROyvG7H6L/gWmnD11IkD9qxmOWhqm3OtASg4E97tHW+Ym7vQm2o/FaD0fAcWRC\n\tH1JXHbuAs6NXCJKBFTylafvpBNu+s2J9S+XBmfY8mKF6CH+vNNnFQs240bG9yfd8SXMlZHjFX0D\n\t9LP3BT9X/px3rbIB6d3WiSUHHLwNZDVF+zf8euatevikC3NSczE9oO6G0J5tlKy/uZzqH7AHOz0\n\tRYNmYRXrPMQMCc8aPQRnx7dsJOGvPUGhIB4BDGdiah74sIyYJhWeHBuMlBIJklCzepOLG/7zgS+\n\t6cLTh0J4J3zHSDw==", "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": "Port the Ccm RkISP1 implementation to use the libipa CcmAlgorithm\nclass.\n\nSigned-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\n---\n src/ipa/rkisp1/algorithms/ccm.cpp | 97 ++++++++-------------------------------\n src/ipa/rkisp1/algorithms/ccm.h | 20 ++++----\n src/ipa/rkisp1/ipa_context.h | 10 ++--\n 3 files changed, 33 insertions(+), 94 deletions(-)", "diff": "diff --git a/src/ipa/rkisp1/algorithms/ccm.cpp b/src/ipa/rkisp1/algorithms/ccm.cpp\nindex 6bb9c7bcfcb3..c1d58fdc43a2 100644\n--- a/src/ipa/rkisp1/algorithms/ccm.cpp\n+++ b/src/ipa/rkisp1/algorithms/ccm.cpp\n@@ -16,13 +16,11 @@\n \n #include <libcamera/ipa/core_ipa_interface.h>\n \n-#include \"libcamera/internal/value_node.h\"\n-\n-#include \"libipa/fixedpoint.h\"\n #include \"libipa/interpolator.h\"\n \n /**\n * \\file ccm.h\n+ * \\brief RkISP1 CCM algorithm implementation\n */\n \n namespace libcamera {\n@@ -31,42 +29,17 @@ namespace ipa::rkisp1::algorithms {\n \n /**\n * \\class Ccm\n- * \\brief A color correction matrix algorithm\n+ * \\brief RkISP1 color correction matrix algorithm\n */\n \n LOG_DEFINE_CATEGORY(RkISP1Ccm)\n \n-constexpr Matrix<float, 3, 3> kIdentity3x3 = Matrix<float, 3, 3>::identity();\n-\n /**\n * \\copydoc libcamera::ipa::Algorithm::init\n */\n int Ccm::init([[maybe_unused]] IPAContext &context, const ValueNode &tuningData)\n {\n-\tauto &cmap = context.ctrlMap;\n-\tcmap[&controls::ColourCorrectionMatrix] = ControlInfo(\n-\t\tControlValue(-8.0f),\n-\t\tControlValue(7.993f),\n-\t\tControlValue(kIdentity3x3.data()));\n-\n-\tint ret = ccm_.readYaml(tuningData[\"ccms\"], \"ct\", \"ccm\");\n-\tif (ret < 0) {\n-\t\tLOG(RkISP1Ccm, Warning)\n-\t\t\t<< \"Failed to parse 'ccm' \"\n-\t\t\t<< \"parameter from tuning file; falling back to unit matrix\";\n-\t\tccm_.setData({ { 0, kIdentity3x3 } });\n-\t}\n-\n-\tret = offsets_.readYaml(tuningData[\"ccms\"], \"ct\", \"offsets\");\n-\tif (ret < 0) {\n-\t\tLOG(RkISP1Ccm, Warning)\n-\t\t\t<< \"Failed to parse 'offsets' \"\n-\t\t\t<< \"parameter from tuning file; falling back to zero offsets\";\n-\n-\t\toffsets_.setData({ { 0, Matrix<int16_t, 3, 1>({ 0, 0, 0 }) } });\n-\t}\n-\n-\treturn 0;\n+\treturn ccmAlgo_.init(tuningData, context.ctrlMap);\n }\n \n /**\n@@ -75,10 +48,8 @@ int Ccm::init([[maybe_unused]] IPAContext &context, const ValueNode &tuningData)\n int Ccm::configure(IPAContext &context,\n \t\t [[maybe_unused]] const IPACameraSensorInfo &configInfo)\n {\n-\tauto &as = context.activeState;\n-\tas.ccm.manual = kIdentity3x3;\n-\tas.ccm.automatic = ccm_.getInterpolated(as.awb.automatic.temperatureK);\n-\treturn 0;\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@@ -90,38 +61,28 @@ void Ccm::queueRequest(IPAContext &context,\n \tif (frameContext.awb.autoEnabled)\n \t\treturn;\n \n-\tauto &ccm = context.activeState.ccm;\n-\n-\tconst auto &colourTemperature = controls.get(controls::ColourTemperature);\n-\tconst auto &ccmMatrix = controls.get(controls::ColourCorrectionMatrix);\n-\tif (ccmMatrix) {\n-\t\tccm.manual = Matrix<float, 3, 3>(*ccmMatrix);\n-\t\tLOG(RkISP1Ccm, Debug)\n-\t\t\t<< \"Setting manual CCM from CCM control to \" << ccm.manual;\n-\t} else if (colourTemperature) {\n-\t\tccm.manual = ccm_.getInterpolated(*colourTemperature);\n-\t\tLOG(RkISP1Ccm, Debug)\n-\t\t\t<< \"Setting manual CCM from CT control to \" << ccm.manual;\n-\t}\n-\n-\tframeContext.ccm.ccm = ccm.manual;\n+\tccmAlgo_.queueRequest(context.activeState.ccm, frameContext.ccm, controls);\n }\n \n-void Ccm::setParameters(struct rkisp1_cif_isp_ctk_config &config,\n-\t\t\tconst Matrix<float, 3, 3> &matrix,\n-\t\t\tconst Matrix<int16_t, 3, 1> &offsets)\n+void Ccm::setParameters(RkISP1Params *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::Ctk>();\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\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.ct_offset[i] = offsets[i][0] & 0xfff;\n+\t\tconfig->ct_offset[i] = offsets[i][0] & 0xfff;\n \n \tLOG(RkISP1Ccm, Debug) << \"Setting matrix \" << matrix;\n \tLOG(RkISP1Ccm, Debug) << \"Setting offsets \" << offsets;\n@@ -133,29 +94,11 @@ void Ccm::setParameters(struct rkisp1_cif_isp_ctk_config &config,\n void Ccm::prepare(IPAContext &context, const uint32_t frame,\n \t\t IPAFrameContext &frameContext, RkISP1Params *params)\n {\n-\tif (!frameContext.awb.autoEnabled) {\n-\t\tauto config = params->block<BlockType::Ctk>();\n-\t\tconfig.setEnabled(true);\n-\t\tsetParameters(*config, frameContext.ccm.ccm, Matrix<int16_t, 3, 1>());\n-\t\treturn;\n-\t}\n-\n-\tuint32_t ct = frameContext.awb.temperatureK;\n-\tif (frame > 0 && ct == ct_) {\n-\t\tframeContext.ccm.ccm = context.activeState.ccm.automatic;\n-\t\treturn;\n-\t}\n-\n-\tct_ = ct;\n-\tMatrix<float, 3, 3> ccm = ccm_.getInterpolated(ct);\n-\tMatrix<int16_t, 3, 1> offsets = offsets_.getInterpolated(ct);\n-\n-\tcontext.activeState.ccm.automatic = ccm;\n-\tframeContext.ccm.ccm = ccm;\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-\tauto config = params->block<BlockType::Ctk>();\n-\tconfig.setEnabled(true);\n-\tsetParameters(*config, ccm, offsets);\n+\tsetParameters(params, frameContext);\n }\n \n /**\n@@ -167,7 +110,7 @@ void Ccm::process([[maybe_unused]] IPAContext &context,\n \t\t [[maybe_unused]] const rkisp1_stat_buffer *stats,\n \t\t ControlList &metadata)\n {\n-\tmetadata.set(controls::ColourCorrectionMatrix, frameContext.ccm.ccm.data());\n+\tccmAlgo_.process(frameContext.ccm, metadata);\n }\n \n REGISTER_IPA_ALGORITHM(Ccm, \"Ccm\")\ndiff --git a/src/ipa/rkisp1/algorithms/ccm.h b/src/ipa/rkisp1/algorithms/ccm.h\nindex 9ac537426d16..6689c42092f3 100644\n--- a/src/ipa/rkisp1/algorithms/ccm.h\n+++ b/src/ipa/rkisp1/algorithms/ccm.h\n@@ -9,11 +9,16 @@\n \n #include <linux/rkisp1-config.h>\n \n-#include \"libcamera/internal/matrix.h\"\n+#include <libcamera/controls.h>\n \n-#include \"libipa/interpolator.h\"\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@@ -41,14 +46,9 @@ public:\n \t\t ControlList &metadata) override;\n \n private:\n-\tvoid parseYaml(const ValueNode &tuningData);\n-\tvoid setParameters(struct rkisp1_cif_isp_ctk_config &config,\n-\t\t\t const Matrix<float, 3, 3> &matrix,\n-\t\t\t const Matrix<int16_t, 3, 1> &offsets);\n-\n-\tunsigned int ct_;\n-\tInterpolator<Matrix<float, 3, 3>> ccm_;\n-\tInterpolator<Matrix<int16_t, 3, 1>> offsets_;\n+\tvoid setParameters(RkISP1Params *params, IPAFrameContext &context);\n+\n+\tCcmAlgorithm<Q<4, 7>> ccmAlgo_;\n };\n \n } /* namespace ipa::rkisp1::algorithms */\ndiff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h\nindex 81b1c7499706..cd97e10bcf2b 100644\n--- a/src/ipa/rkisp1/ipa_context.h\n+++ b/src/ipa/rkisp1/ipa_context.h\n@@ -27,6 +27,7 @@\n #include \"libipa/agc_mean_luminance.h\"\n #include \"libipa/awb.h\"\n #include \"libipa/camera_sensor_helper.h\"\n+#include \"libipa/ccm.h\"\n #include \"libipa/fc_queue.h\"\n #include \"libipa/fixedpoint.h\"\n \n@@ -104,10 +105,7 @@ struct IPAActiveState {\n \n \tipa::awb::ActiveState awb;\n \n-\tstruct {\n-\t\tMatrix<float, 3, 3> manual;\n-\t\tMatrix<float, 3, 3> automatic;\n-\t} ccm;\n+\tipa::ccm::ActiveState ccm;\n \n \tstruct {\n \t\tBrightnessQ brightness;\n@@ -203,9 +201,7 @@ struct IPAFrameContext : public FrameContext {\n \t\tdouble gain;\n \t} sensor;\n \n-\tstruct {\n-\t\tMatrix<float, 3, 3> ccm;\n-\t} ccm;\n+\tipa::ccm::FrameContext ccm;\n \n \tstruct {\n \t\tdouble lux;\n", "prefixes": [ "06/11" ] }