[{"id":29273,"web_url":"https://patchwork.libcamera.org/comment/29273/","msgid":"","date":"2024-04-19T08:15:53","subject":"Re: [PATCH v2 3/3] ipa: rkisp1: algorithms: Add crosstalk algorithm","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"I forgot to mention that this patch depends on \"[PATCH] libcamera:\nutils: Add a helper to convert floating-point to fixed-point\"\n\n\nPaul\n\nOn Fri, Apr 19, 2024 at 04:18:19PM +0900, Paul Elder wrote:\n> Add an algorithm module to the rkisp1 IPA for crosstalk correction.\n> \n> Signed-off-by: Paul Elder \n> \n> ---\n> Changes 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 | 101 ++++++++++++++++++++++++++\n> src/ipa/rkisp1/algorithms/ccm.h | 41 +++++++++++\n> src/ipa/rkisp1/algorithms/meson.build | 1 +\n> 3 files changed, 143 insertions(+)\n> create mode 100644 src/ipa/rkisp1/algorithms/ccm.cpp\n> create mode 100644 src/ipa/rkisp1/algorithms/ccm.h\n> \n> diff --git a/src/ipa/rkisp1/algorithms/ccm.cpp b/src/ipa/rkisp1/algorithms/ccm.cpp\n> new file mode 100644\n> index 00000000..1ae6ea85\n> --- /dev/null\n> +++ b/src/ipa/rkisp1/algorithms/ccm.cpp\n> @@ -0,0 +1,101 @@\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 \n> +#include \n> +#include \n> +#include \n> +#include \n> +\n> +#include \n> +#include \n> +\n> +#include \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> +int Ccm::parseYaml(const YamlObject &tuningData, const char *prop)\n> +{\n> +\tint ret = 0;\n> +\n> +\tconst YamlObject &yaml = tuningData[prop];\n> +\tret = ccm_.readYaml(yaml);\n> +\tif (ret < 0) {\n> +\t\tLOG(RkISP1Ccm, Error)\n> +\t\t\t<< \"Failed to parse '\" << prop\n> +\t\t\t<< \"' parameter from tuning file; falling back to unit matrix\";\n> +\t\tccm_.reset();\n> +\t}\n> +\n> +\treturn ret;\n> +}\n> +\n> +/**\n> + * \\copydoc libcamera::ipa::Algorithm::init\n> + */\n> +int Ccm::init([[maybe_unused]] IPAContext &context, const YamlObject &tuningData)\n> +{\n> +\treturn parseYaml(tuningData, \"ccms\");\n> +}\n> +\n> +void Ccm::setParameters(rkisp1_params_cfg *params, const Matrix &matrix)\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> +\tLOG(RkISP1Ccm, Debug) << \"Setting matrix \" << matrix.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 ccm = ccm_.get(ct);\n> +\n> +\tsetParameters(params, ccm);\n> +}\n> +\n> +REGISTER_IPA_ALGORITHM(Ccm, \"Ccm\")\n> +\n> +} /* namespace ipa::rkisp1::algorithms */\n> +\n> +} /* namespace libcamera */\n> diff --git a/src/ipa/rkisp1/algorithms/ccm.h b/src/ipa/rkisp1/algorithms/ccm.h\n> new file mode 100644\n> index 00000000..fc88e338\n> --- /dev/null\n> +++ b/src/ipa/rkisp1/algorithms/ccm.h\n> @@ -0,0 +1,41 @@\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 \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> +\tint parseYaml(const YamlObject &tuningData, const char *prop);\n> +\tvoid setParameters(rkisp1_params_cfg *params, const Matrix &matrix);\n> +\n> +\tMatrixInterpolator ccm_;\n> +};\n> +\n> +} /* namespace ipa::rkisp1::algorithms */\n> +\n> +} /* namespace libcamera */\n> diff --git a/src/ipa/rkisp1/algorithms/meson.build b/src/ipa/rkisp1/algorithms/meson.build\n> index 93a48329..c9891e87 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> + 'ctk.cpp',\n> 'cproc.cpp',\n> 'dpcc.cpp',\n> 'dpf.cpp',\n> -- \n> 2.39.2\n>","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 572BBC3200\n\tfor ;\n\tFri, 19 Apr 2024 08:16:03 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5F867633F3;\n\tFri, 19 Apr 2024 10:16:02 +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 80B4B61B3D\n\tfor ;\n\tFri, 19 Apr 2024 10:16:00 +0200 (CEST)","from pyrite.rasen.tech (h175-177-049-156.catv02.itscom.jp\n\t[175.177.49.156])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6C6092E7\n\tfor ;\n\tFri, 19 Apr 2024 10:15: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=\"vXjrBgla\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1713514512;\n\tbh=LY4wdlquRrA1rOvNW+2N0wWRN4NztduWjomk4TmAAeU=;\n\th=Date:From:To:Subject:References:In-Reply-To:From;\n\tb=vXjrBglap1CHL6Mlot/dsTvg5AdOWc6n372256cIAASdzw1NYdMgYpEG/qSaw1diO\n\t8tG+QPhzHp88I9yyVJhp/RskVon0MyplHgmXrW0CMheiGYgSDMoGFv4Snqq9CcD8or\n\tpWjDxi+KXqTbA2oEHoYWAgN6OAy4lSrVk5KuAYa8=","Date":"Fri, 19 Apr 2024 17:15:53 +0900","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Subject":"Re: [PATCH v2 3/3] ipa: rkisp1: algorithms: Add crosstalk algorithm","Message-ID":"","References":"<20240419071819.1325791-1-paul.elder@ideasonboard.com>\n\t<20240419071819.1325791-4-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<20240419071819.1325791-4-paul.elder@ideasonboard.com>","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\" "}}]