{"id":20344,"url":"https://patchwork.libcamera.org/api/1.1/patches/20344/?format=json","web_url":"https://patchwork.libcamera.org/patch/20344/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20240616174541.10708-4-laurent.pinchart@ideasonboard.com>","date":"2024-06-16T17:45:40","name":"[v10,3/4] ipa: rkisp1: algorithms: Add crosstalk algorithm","commit_ref":"cbfdfa42cacc0c9b83abb604e19febaf505cf24f","pull_url":null,"state":"accepted","archived":false,"hash":"6705bd0e0bb77c85214b7b476490485490a2f70e","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/20344/mbox/","series":[{"id":4401,"url":"https://patchwork.libcamera.org/api/1.1/series/4401/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4401","date":"2024-06-16T17:45:37","name":"ipa: rkisp1: Add crosstalk algorithm","version":10,"mbox":"https://patchwork.libcamera.org/series/4401/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/20344/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/20344/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 DB894C32CF\n\tfor ;\n\tSun, 16 Jun 2024 17:46:12 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 288D265497;\n\tSun, 16 Jun 2024 19:46:12 +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 D04CC65490\n\tfor ;\n\tSun, 16 Jun 2024 19:46:07 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 70CC82D5;\n\tSun, 16 Jun 2024 19:45:51 +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=\"J34AT7mg\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1718559951;\n\tbh=mTzbNY1TvRpZMGhbf3kYd120tG4UA0q0g0J3ACMt5O4=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=J34AT7mgP22vtpYxSaFVHXAonwbErdFtv8XkBIKUvvxoFnsLWZ0lmA6DE8xjzW5Zv\n\t7PS5SoKtiBdvKSk0+BQ9OSyGkq/1P9v/X9CGX4ecHmpuhgVfgJMfiGNldxO57LxJ0m\n\tieWSsxibl7vryTORgHwZ/cJFOucraV6jpaqD74q4=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Cc":"Paul Elder ","Subject":"[PATCH v10 3/4] ipa: rkisp1: algorithms: Add crosstalk algorithm","Date":"Sun, 16 Jun 2024 20:45:40 +0300","Message-ID":"<20240616174541.10708-4-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.44.2","In-Reply-To":"<20240616174541.10708-1-laurent.pinchart@ideasonboard.com>","References":"<20240616174541.10708-1-laurent.pinchart@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":"From: Paul Elder \n\nAdd an algorithm module to the rkisp1 IPA for crosstalk correction.\n\nSigned-off-by: Paul Elder \nReviewed-by: Stefan Klug \nReviewed-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \nSigned-off-by: Laurent Pinchart \n---\nChanges since v9:\n\n- Add \\todo comment about colour temperature filtering\n\nChanges in v9:\n- compilation fixes\n\nChanges in v8:\n- cleanups\n\nChanges in v7:\n- make offsets_ default to zero-matrices as opposed to identity matrices\n- checkstyle\n- populate metadata\n - add ccm to IPAFrameContext\n- don't update the ccm if the color temperature didn't change\n\nNo change in v6\n\nChanges in v5:\n- clean up documentation\n- coalesce parseYaml into init\n\nChanges in v4:\n- remove stray semicolons\n- use the new matrix interpolator readYaml\n- use the new matrix operator[] getter\n\nChanges in v3:\n- read ccm offsets from tuning data, and write these offsets to the\n parameters buffer\n- make parseYaml return void, as it should fill in default data if\n unable to read, thus never failing\n\nChanges in v2:\n- rename ctk to ccm\n- reset the matrix interpolator to identity matrix if failed to read\n from tuning file\n---\n src/ipa/rkisp1/algorithms/ccm.cpp | 147 ++++++++++++++++++++++++++\n src/ipa/rkisp1/algorithms/ccm.h | 49 +++++++++\n src/ipa/rkisp1/algorithms/meson.build | 1 +\n src/ipa/rkisp1/ipa_context.h | 5 +\n 4 files changed, 202 insertions(+)\n create mode 100644 src/ipa/rkisp1/algorithms/ccm.cpp\n create mode 100644 src/ipa/rkisp1/algorithms/ccm.h","diff":"diff --git a/src/ipa/rkisp1/algorithms/ccm.cpp b/src/ipa/rkisp1/algorithms/ccm.cpp\nnew file mode 100644\nindex 000000000000..c1f5403a8ab2\n--- /dev/null\n+++ b/src/ipa/rkisp1/algorithms/ccm.cpp\n@@ -0,0 +1,147 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2024, Ideas On Board\n+ *\n+ * RkISP1 Color Correction Matrix control algorithm\n+ */\n+\n+#include \"ccm.h\"\n+\n+#include \n+#include \n+#include \n+#include \n+#include \n+\n+#include \n+#include \n+\n+#include \n+\n+#include \n+\n+#include \"libcamera/internal/yaml_parser.h\"\n+\n+#include \"../utils.h\"\n+#include \"libipa/matrix_interpolator.h\"\n+\n+/**\n+ * \\file ccm.h\n+ */\n+\n+namespace libcamera {\n+\n+namespace ipa::rkisp1::algorithms {\n+\n+/**\n+ * \\class Ccm\n+ * \\brief A color correction matrix algorithm\n+ */\n+\n+LOG_DEFINE_CATEGORY(RkISP1Ccm)\n+\n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::init\n+ */\n+int Ccm::init([[maybe_unused]] IPAContext &context, const YamlObject &tuningData)\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_.reset();\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+\t\t/*\n+\t\t * MatrixInterpolator::reset() resets to identity matrices\n+\t\t * while here we need zero matrices so we need to construct it\n+\t\t * ourselves.\n+\t\t */\n+\t\tMatrix m({ 0, 0, 0 });\n+\t\tstd::map> matrices = { { 0, m } };\n+\t\toffsets_ = MatrixInterpolator(matrices);\n+\t}\n+\n+\treturn 0;\n+}\n+\n+void Ccm::setParameters(rkisp1_params_cfg *params,\n+\t\t\tconst Matrix &matrix,\n+\t\t\tconst Matrix &offsets)\n+{\n+\tstruct rkisp1_cif_isp_ctk_config &config = params->others.ctk_config;\n+\n+\t/*\n+\t * 4 bit integer and 7 bit fractional, ranging from -8 (0x400) to\n+\t * +7.992 (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] =\n+\t\t\t\tutils::floatingToFixedPoint<4, 7, uint16_t, double>(matrix[i][j]);\n+\t}\n+\n+\tfor (unsigned int i = 0; i < 3; i++)\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+\n+\tparams->module_en_update |= RKISP1_CIF_ISP_MODULE_CTK;\n+\tparams->module_ens |= RKISP1_CIF_ISP_MODULE_CTK;\n+\tparams->module_cfg_update |= RKISP1_CIF_ISP_MODULE_CTK;\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,\n+\t\t rkisp1_params_cfg *params)\n+{\n+\tuint32_t ct = context.activeState.awb.temperatureK;\n+\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\treturn;\n+\n+\tct_ = ct;\n+\tMatrix ccm = ccm_.get(ct);\n+\tMatrix offsets = offsets_.get(ct);\n+\n+\tframeContext.ccm.ccm = ccm;\n+\n+\tsetParameters(params, ccm, offsets);\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 rkisp1_stat_buffer *stats,\n+\t\t ControlList &metadata)\n+{\n+\tfloat m[9];\n+\tfor (unsigned int i = 0; i < 3; i++) {\n+\t\tfor (unsigned int j = 0; j < 3; j++)\n+\t\t\tm[i] = frameContext.ccm.ccm[i][j];\n+\t}\n+\tmetadata.set(controls::ColourCorrectionMatrix, m);\n+}\n+\n+REGISTER_IPA_ALGORITHM(Ccm, \"Ccm\")\n+\n+} /* namespace ipa::rkisp1::algorithms */\n+\n+} /* namespace libcamera */\ndiff --git a/src/ipa/rkisp1/algorithms/ccm.h b/src/ipa/rkisp1/algorithms/ccm.h\nnew file mode 100644\nindex 000000000000..30cb882180cc\n--- /dev/null\n+++ b/src/ipa/rkisp1/algorithms/ccm.h\n@@ -0,0 +1,49 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2024, Ideas On Board\n+ *\n+ * RkISP1 Color Correction Matrix control algorithm\n+ */\n+\n+#pragma once\n+\n+#include \n+\n+#include \"libipa/matrix.h\"\n+#include \"libipa/matrix_interpolator.h\"\n+\n+#include \"algorithm.h\"\n+\n+namespace libcamera {\n+\n+namespace ipa::rkisp1::algorithms {\n+\n+class Ccm : public Algorithm\n+{\n+public:\n+\tCcm() {}\n+\t~Ccm() = default;\n+\n+\tint init(IPAContext &context, const YamlObject &tuningData) override;\n+\tvoid prepare(IPAContext &context, const uint32_t frame,\n+\t\t IPAFrameContext &frameContext,\n+\t\t rkisp1_params_cfg *params) override;\n+\tvoid process(IPAContext &context, const uint32_t frame,\n+\t\t IPAFrameContext &frameContext,\n+\t\t const rkisp1_stat_buffer *stats,\n+\t\t ControlList &metadata) override;\n+\n+private:\n+\tvoid parseYaml(const YamlObject &tuningData);\n+\tvoid setParameters(rkisp1_params_cfg *params,\n+\t\t\t const Matrix &matrix,\n+\t\t\t const Matrix &offsets);\n+\n+\tunsigned int ct_;\n+\tMatrixInterpolator ccm_;\n+\tMatrixInterpolator offsets_;\n+};\n+\n+} /* namespace ipa::rkisp1::algorithms */\n+\n+} /* namespace libcamera */\ndiff --git a/src/ipa/rkisp1/algorithms/meson.build b/src/ipa/rkisp1/algorithms/meson.build\nindex 6ee71a9b5da3..1734a6675f78 100644\n--- a/src/ipa/rkisp1/algorithms/meson.build\n+++ b/src/ipa/rkisp1/algorithms/meson.build\n@@ -4,6 +4,7 @@ rkisp1_ipa_algorithms = files([\n 'agc.cpp',\n 'awb.cpp',\n 'blc.cpp',\n+ 'ccm.cpp',\n 'cproc.cpp',\n 'dpcc.cpp',\n 'dpf.cpp',\ndiff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h\nindex 6022480d4fd2..4f01a7f8ed33 100644\n--- a/src/ipa/rkisp1/ipa_context.h\n+++ b/src/ipa/rkisp1/ipa_context.h\n@@ -17,6 +17,7 @@\n #include \n \n #include \n+#include \n \n namespace libcamera {\n \n@@ -163,6 +164,10 @@ struct IPAFrameContext : public FrameContext {\n \t\tuint32_t exposure;\n \t\tdouble gain;\n \t} sensor;\n+\n+\tstruct {\n+\t\tMatrix ccm;\n+\t} ccm;\n };\n \n struct IPAContext {\n","prefixes":["v10","3/4"]}