Patch Detail
Show a patch.
GET /api/1.1/patches/20006/?format=api
{ "id": 20006, "url": "https://patchwork.libcamera.org/api/1.1/patches/20006/?format=api", "web_url": "https://patchwork.libcamera.org/patch/20006/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20240507061016.1716450-4-paul.elder@ideasonboard.com>", "date": "2024-05-07T06:10:16", "name": "[v3,3/3] ipa: rkisp1: algorithms: Add crosstalk algorithm", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "145801be8e48fd60b7681ef4aba45b9688830ba9", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/1.1/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/20006/mbox/", "series": [ { "id": 4290, "url": "https://patchwork.libcamera.org/api/1.1/series/4290/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4290", "date": "2024-05-07T06:10:13", "name": "ipa: rkisp1: Add crosstalk algorithm", "version": 3, "mbox": "https://patchwork.libcamera.org/series/4290/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/20006/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/20006/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 28743C32C9\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 7 May 2024 06:10:42 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3431463436;\n\tTue, 7 May 2024 08:10:41 +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 5C4AA633DF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 7 May 2024 08:10:37 +0200 (CEST)", "from neptunite.hamster-moth.ts.net\n\t(h175-177-049-156.catv02.itscom.jp [175.177.49.156])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 861E93D5;\n\tTue, 7 May 2024 08:10:34 +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=\"RI5MklQQ\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1715062235;\n\tbh=AkgkWex9BhnvKKfyZRMsddIeKCew0HtYW9ftOGJMmyw=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=RI5MklQQUhG70rEAidfHCcmt2nGVQqOu9lmmyXcvQxkIxmYZxmoJyNbFGgUIMf3l8\n\tqYmYrPtDzaTgV9yOGo3x/FHx3VgWVvOvnGxQJbpEf0sCDI09h4jm46MT9Wqzp2Kpss\n\t+wKFGdGyqshL9rmzbk1TfuC3S5PKoVbl3XEIg8Xs=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Paul Elder <paul.elder@ideasonboard.com>", "Subject": "[PATCH v3 3/3] ipa: rkisp1: algorithms: Add crosstalk algorithm", "Date": "Tue, 7 May 2024 15:10:16 +0900", "Message-Id": "<20240507061016.1716450-4-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.39.2", "In-Reply-To": "<20240507061016.1716450-1-paul.elder@ideasonboard.com>", "References": "<20240507061016.1716450-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": "<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": "Add an algorithm module to the rkisp1 IPA for crosstalk correction.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n\n---\nThis patch depends on \"[PATCH] libcamera: utils: Add a helper to convert\nfloating-point to fixed-point\"\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 | 116 ++++++++++++++++++++++++++\n src/ipa/rkisp1/algorithms/ccm.h | 44 ++++++++++\n src/ipa/rkisp1/algorithms/meson.build | 1 +\n 3 files changed, 161 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 00000000..11fa5ec2\n--- /dev/null\n+++ b/src/ipa/rkisp1/algorithms/ccm.cpp\n@@ -0,0 +1,116 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2024, Ideas On Board\n+ *\n+ * ccm.cpp - RkISP1 Cross Talk Correction control algorithm\n+ */\n+\n+#include \"ccm.h\"\n+\n+#include <algorithm>\n+#include <chrono>\n+#include <cmath>\n+#include <tuple>\n+#include <vector>\n+\n+#include <libcamera/base/log.h>\n+#include <libcamera/base/utils.h>\n+\n+#include <libcamera/ipa/core_ipa_interface.h>\n+\n+#include \"libcamera/internal/yaml_parser.h\"\n+\n+#include \"libipa/matrix_interpolator.h\"\n+\n+/**\n+ * \\file ctk.h\n+ */\n+\n+namespace libcamera {\n+\n+namespace ipa::rkisp1::algorithms {\n+\n+/**\n+ * \\class Ccm\n+ * \\brief A cross talk correction algorithm\n+ */\n+\n+LOG_DEFINE_CATEGORY(RkISP1Ccm)\n+\n+void Ccm::parseYaml(const YamlObject &tuningData)\n+{\n+\tint ret = ccm_.readYaml(tuningData[\"ccms\"]);\n+\tif (ret < 0) {\n+\t\tLOG(RkISP1Ccm, Warning)\n+\t\t\t<< \"Failed to parse 'ccms' \"\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[\"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\tconst std::map<unsigned int, Matrix<int16_t, 3, 1>> offsets = {\n+\t\t\t{ 0, Matrix<int16_t, 3, 1>({ 0, 0, 0 }) }\n+\t\t};\n+\t\tMatrixInterpolator<int16_t, 3, 1> interpolator(offsets);\n+\t\toffsets_ = interpolator;\n+\t}\n+}\n+\n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::init\n+ */\n+int Ccm::init([[maybe_unused]] IPAContext &context, const YamlObject &tuningData)\n+{\n+\tparseYaml(tuningData);\n+\treturn 0;\n+}\n+\n+void Ccm::setParameters(rkisp1_params_cfg *params,\n+\t\t\tconst Matrix<double, 3, 3> &matrix,\n+\t\t\tconst Matrix<int16_t, 3, 1> &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.get(i, j));\n+\n+\tfor (unsigned int i = 0; i < 3; i++)\n+\t\tconfig.ct_offset[i] = offsets.get(i, 0) & 0xFFF;\n+\n+\tLOG(RkISP1Ccm, Debug) << \"Setting matrix \" << matrix.toString();\n+\tLOG(RkISP1Ccm, Debug) << \"Setting offsets \" << offsets.toString();\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, [[maybe_unused]] const uint32_t frame,\n+\t\t [[maybe_unused]] IPAFrameContext &frameContext,\n+\t\t rkisp1_params_cfg *params)\n+{\n+\tuint32_t ct = context.activeState.awb.temperatureK;\n+\tMatrix<double, 3, 3> ccm = ccm_.get(ct);\n+\tMatrix<int16_t, 3, 1> offsets = offsets_.get(ct);\n+\n+\tsetParameters(params, ccm, offsets);\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 00000000..dcab5cd3\n--- /dev/null\n+++ b/src/ipa/rkisp1/algorithms/ccm.h\n@@ -0,0 +1,44 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2024, Ideas On Board\n+ *\n+ * ccm.h - RkISP1 Cross Talk Correction control algorithm\n+ */\n+\n+#pragma once\n+\n+#include <linux/rkisp1-config.h>\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+\n+private:\n+\tvoid parseYaml(const YamlObject &tuningData);\n+\tvoid setParameters(rkisp1_params_cfg *params,\n+\t\t\t const Matrix<double, 3, 3> &matrix,\n+\t\t\t const Matrix<int16_t, 3, 1> &offsets);\n+\n+\tMatrixInterpolator<double, 3, 3> ccm_;\n+\tMatrixInterpolator<int16_t, 3, 1> 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 93a48329..16de7133 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',\n", "prefixes": [ "v3", "3/3" ] }