{"id":27205,"url":"https://patchwork.libcamera.org/api/patches/27205/?format=json","web_url":"https://patchwork.libcamera.org/patch/27205/","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":"<20260706-libipa-algorithms-v3-5-968757b038bb@ideasonboard.com>","date":"2026-07-06T08:01:25","name":"[v3,05/35] ipa: rkisp1: ccm: Port to use CcmAlgorithm","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"572807964a75a33d3dc25d9723f0e635c4be5021","submitter":{"id":143,"url":"https://patchwork.libcamera.org/api/people/143/?format=json","name":"Jacopo Mondi","email":"jacopo.mondi@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/27205/mbox/","series":[{"id":6038,"url":"https://patchwork.libcamera.org/api/series/6038/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=6038","date":"2026-07-06T08:01:20","name":"ipa: libipa: Introduce libipa algorithms","version":3,"mbox":"https://patchwork.libcamera.org/series/6038/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/27205/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/27205/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 66510C330A\n\tfor ;\n\tMon, 6 Jul 2026 08:02:08 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 57C3066023;\n\tMon, 6 Jul 2026 10:02:06 +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 5B84766005\n\tfor ;\n\tMon, 6 Jul 2026 10:02:00 +0200 (CEST)","from [192.168.125.177] (mob-109-113-60-81.net.vodafone.it\n\t[109.113.60.81])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id DE8A11CD6;\n\tMon, 6 Jul 2026 10:01:11 +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=\"sqxNi75A\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1783324872;\n\tbh=OuAZ5xcMlcPP4/KppV4o/XVP7CsPoOZKhIMpI5r6T+4=;\n\th=From:Date:Subject:References:In-Reply-To:To:Cc:From;\n\tb=sqxNi75A7+i5gNI2j0Lf88OFcVB8s1+fg3CMN/n2c2pUcik4qtNYjomIhCnkQwhXw\n\tlGK2qA0MfpXTdvrniqahf1mG15D8+8tFjmkvvjnpcjiz6jQs6zn+FT45TBkDDgGwsO\n\tvKHuA4PHOqCjcHqNMWVWy01+GmgetXXEuml5M+Wo=","From":"Jacopo Mondi ","Date":"Mon, 06 Jul 2026 10:01:25 +0200","Subject":"[PATCH v3 05/35] ipa: rkisp1: ccm: Port to use CcmAlgorithm","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"7bit","Message-Id":"<20260706-libipa-algorithms-v3-5-968757b038bb@ideasonboard.com>","References":"<20260706-libipa-algorithms-v3-0-968757b038bb@ideasonboard.com>","In-Reply-To":"<20260706-libipa-algorithms-v3-0-968757b038bb@ideasonboard.com>","To":"libcamera-devel@lists.libcamera.org, \n\tStefan Klug ","Cc":"Jacopo Mondi , \n\tKieran Bingham , \n\tDaniel Scally ","X-Mailer":"b4 0.14.3","X-Developer-Signature":"v=1; a=openpgp-sha256; l=8053;\n\ti=jacopo.mondi@ideasonboard.com; h=from:subject:message-id;\n\tbh=OuAZ5xcMlcPP4/KppV4o/XVP7CsPoOZKhIMpI5r6T+4=;\n\tb=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBqS2DvCCHPl6OXdtK58VgyNspxFBVW/5kHMq1SU\n\tTuXRamUkLGJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCaktg7wAKCRByNAaPFqFW\n\tPKvTD/0fPq9Wve8NGpWBCEX4VNabAHSinduK/S9fjLSfSxXQJjaAd0Cc3KCwaeHIQlSofIIGVEC\n\tGcGBh/iUbsxW9EqnWXSI9zsJUnWSKxjt4CymLEroC9KxxKPIUmcOy1hrMWwLxlsiq4fd27drGgH\n\tNOwVU2Rnp6WFqpqI0Ea8NCudwDZJs9jU541JXBcZSkdJtDMy84qAh9PpFichvNPMHl6kJCz+IAT\n\twHo9QRNHCbs1e7KiY+qYBOAZvK/hep5PuFKTK/HrhqoWx/7JfeyhOX6FylTeRs4M//rRJzf8UwQ\n\tU/eyXxQxbgU4YjOTFXL/NovUJatdy3tXz/kYRtoZEaa8/VetTv8rFcw15HR41CGW7zud8Bp/9HA\n\t6efFt11HvUFQQeTAOBMqsg82856WVG05EfjqBrhJiTZU/uqES2xXq19hOhZxHm57qzHtmg98Ttg\n\tidcaR3cyF6L1oHchCrSjJEA4Fd3y9+7R39Swv++UqSEBz3GQwbiZOXkTZDtc1J/f2hfjZp8wGPC\n\tZTZxN3nugeHvw9x/UF3Oyog4UmG3MQhXt1yOdb1eHJp/tUnPebLAGxrPN83h2UwEV1j3IbgaCgw\n\t35qnrvsDdPwSevwnE7jpS8xkhGdBxAmG5l+H4uC6e1GQfatq51rYUQ98dSajO41rWk5qMDaJ617\n\tv5AFDZN0mbcTKkg==","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":"","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":"Port the Ccm RkISP1 implementation to use the libipa CcmAlgorithm\nclass.\n\nSigned-off-by: Jacopo Mondi \nReviewed-by: Kieran Bingham \nReviewed-by: Daniel Scally \n---\n src/ipa/rkisp1/algorithms/ccm.cpp | 97 ++++++++-------------------------------\n src/ipa/rkisp1/algorithms/ccm.h | 17 +++----\n src/ipa/rkisp1/ipa_context.h | 10 ++--\n 3 files changed, 32 insertions(+), 92 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 \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 kIdentity3x3 = Matrix::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({ 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(*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 &matrix,\n-\t\t\tconst Matrix &offsets)\n+void Ccm::setParameters(RkISP1Params *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\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();\n-\t\tconfig.setEnabled(true);\n-\t\tsetParameters(*config, frameContext.ccm.ccm, Matrix());\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 ccm = ccm_.getInterpolated(ct);\n-\tMatrix 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();\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 3d3a660065ff..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 \n \n-#include \"libcamera/internal/matrix.h\"\n+#include \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,13 +46,9 @@ public:\n \t\t ControlList &metadata) override;\n \n private:\n-\tvoid setParameters(struct rkisp1_cif_isp_ctk_config &config,\n-\t\t\t const Matrix &matrix,\n-\t\t\t const Matrix &offsets);\n+\tvoid setParameters(RkISP1Params *params, IPAFrameContext &context);\n \n-\tunsigned int ct_;\n-\tInterpolator> ccm_;\n-\tInterpolator> offsets_;\n+\tCcmAlgorithm> 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 c36c1f7e0084..6698ccfd77cf 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@@ -105,10 +106,7 @@ struct IPAActiveState {\n \n \tipa::awb::ActiveState awb;\n \n-\tstruct {\n-\t\tMatrix manual;\n-\t\tMatrix automatic;\n-\t} ccm;\n+\tipa::ccm::ActiveState ccm;\n \n \tstruct {\n \t\tfloat requestedBrightness;\n@@ -207,9 +205,7 @@ struct IPAFrameContext : public FrameContext {\n \t\tdouble gain;\n \t} sensor;\n \n-\tstruct {\n-\t\tMatrix ccm;\n-\t} ccm;\n+\tipa::ccm::FrameContext ccm;\n \n \tstruct {\n \t\tdouble lux;\n","prefixes":["v3","05/35"]}