{"id":22989,"url":"https://patchwork.libcamera.org/api/patches/22989/?format=json","web_url":"https://patchwork.libcamera.org/patch/22989/","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":"<20250319161152.63625-12-stefan.klug@ideasonboard.com>","date":"2025-03-19T16:11:16","name":"[v2,11/17] ipa: rkisp1: Implement manual ColourCorrectionMatrix control","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"b19531f821b6254b889d08a58142bbc28e507b9f","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22989/mbox/","series":[{"id":5071,"url":"https://patchwork.libcamera.org/api/series/5071/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5071","date":"2025-03-19T16:11:05","name":"Some rkisp1 awb improvements","version":2,"mbox":"https://patchwork.libcamera.org/series/5071/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22989/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22989/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 E400DC32FE\n\tfor ;\n\tWed, 19 Mar 2025 16:12:30 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 94A386896C;\n\tWed, 19 Mar 2025 17:12:30 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 57C3F68962\n\tfor ;\n\tWed, 19 Mar 2025 17:12:29 +0100 (CET)","from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:760:e5ca:4814:99c7])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 777F455A;\n\tWed, 19 Mar 2025 17:10:46 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"LIdCnPre\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1742400646;\n\tbh=96p0ZlNnEnooA92EeItd8ynm89pE3xwAD+FvHp4hNtc=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=LIdCnPre+r2CnJQAYNm/rmiaSGzmBzmPpK9XR1bTEH2bxOpVhdQZC+VuF/6KZO6Xi\n\t+JstepYqV4qOWGZhM6tG0P03wJ+lSQAefxL1buRmPl0nhza5MZTi0BUnrj4y4UWvT0\n\te1w3aw2nPCDQKBB2ZM0ocFBYZiLpyRtPgvKRumPI=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ","Subject":"[PATCH v2 11/17] ipa: rkisp1: Implement manual\n\tColourCorrectionMatrix control","Date":"Wed, 19 Mar 2025 17:11:16 +0100","Message-ID":"<20250319161152.63625-12-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20250319161152.63625-1-stefan.klug@ideasonboard.com>","References":"<20250319161152.63625-1-stefan.klug@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":"Add a manual ColourCorrectionMatrix control. This was already discussed\nwhile implementing manual colour temperature but was never implemented.\nThe control allows to manually specify the CCM when AwbEnable is false.\n\nSigned-off-by: Stefan Klug \n\n---\n\nChanges in v2:\n- None\n---\n src/ipa/rkisp1/algorithms/ccm.cpp | 59 ++++++++++++++++++++++++++++---\n src/ipa/rkisp1/algorithms/ccm.h | 6 ++++\n src/ipa/rkisp1/ipa_context.h | 3 +-\n 3 files changed, 62 insertions(+), 6 deletions(-)","diff":"diff --git a/src/ipa/rkisp1/algorithms/ccm.cpp b/src/ipa/rkisp1/algorithms/ccm.cpp\nindex 2e5e91006b55..303ac3dd2fe2 100644\n--- a/src/ipa/rkisp1/algorithms/ccm.cpp\n+++ b/src/ipa/rkisp1/algorithms/ccm.cpp\n@@ -36,17 +36,25 @@ namespace ipa::rkisp1::algorithms {\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 YamlObject &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, Matrix::identity() } });\n+\t\tccm_.setData({ { 0, kIdentity3x3 } });\n \t}\n \n \tret = offsets_.readYaml(tuningData[\"ccms\"], \"ct\", \"offsets\");\n@@ -61,13 +69,48 @@ int Ccm::init([[maybe_unused]] IPAContext &context, const YamlObject &tuningData\n \treturn 0;\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+\tauto &as = context.activeState;\n+\tas.ccm.manual = kIdentity3x3;\n+\tas.ccm.automatic = ccm_.getInterpolated(as.awb.automatic.temperatureK);\n+\tLOG(RkISP1Ccm, Debug) << \"init matrix \" << as.ccm.manual;\n+\treturn 0;\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+\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+\telse if (colourTemperature)\n+\t\tccm.manual = ccm_.getInterpolated(*colourTemperature);\n+\n+\tLOG(RkISP1Ccm, Debug) << \"queueRequest matrix \" << ccm.manual;\n+\tframeContext.ccm.ccm = ccm.manual;\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 {\n \t/*\n \t * 4 bit integer and 7 bit fractional, ranging from -8 (0x400) to\n-\t * +7.992 (0x3ff)\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@@ -88,14 +131,20 @@ 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-\tuint32_t ct = frameContext.awb.temperatureK;\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 \t/*\n \t * \\todo The colour temperature will likely be noisy, add filtering to\n \t * avoid updating the CCM matrix all the time.\n \t */\n \tif (frame > 0 && ct == ct_) {\n-\t\tframeContext.ccm.ccm = context.activeState.ccm.ccm;\n+\t\tframeContext.ccm.ccm = context.activeState.ccm.automatic;\n \t\treturn;\n \t}\n \n@@ -103,7 +152,7 @@ void Ccm::prepare(IPAContext &context, const uint32_t frame,\n \tMatrix ccm = ccm_.getInterpolated(ct);\n \tMatrix offsets = offsets_.getInterpolated(ct);\n \n-\tcontext.activeState.ccm.ccm = ccm;\n+\tcontext.activeState.ccm.automatic = ccm;\n \tframeContext.ccm.ccm = ccm;\n \n \tauto config = params->block();\ndiff --git a/src/ipa/rkisp1/algorithms/ccm.h b/src/ipa/rkisp1/algorithms/ccm.h\nindex a5d9a9a45e5d..c301e6e531c8 100644\n--- a/src/ipa/rkisp1/algorithms/ccm.h\n+++ b/src/ipa/rkisp1/algorithms/ccm.h\n@@ -26,6 +26,12 @@ public:\n \t~Ccm() = default;\n \n \tint init(IPAContext &context, const YamlObject &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 RkISP1Params *params) override;\ndiff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h\nindex 769e9f114e23..f0d504215d34 100644\n--- a/src/ipa/rkisp1/ipa_context.h\n+++ b/src/ipa/rkisp1/ipa_context.h\n@@ -101,7 +101,8 @@ struct IPAActiveState {\n \t} awb;\n \n \tstruct {\n-\t\tMatrix ccm;\n+\t\tMatrix manual;\n+\t\tMatrix automatic;\n \t} ccm;\n \n \tstruct {\n","prefixes":["v2","11/17"]}