From patchwork Fri Apr 5 08:40:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 19847 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id B2F3BC327C for ; Fri, 5 Apr 2024 08:41:04 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B869461C29; Fri, 5 Apr 2024 10:41:02 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="lT9b1yyj"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 580E261C21 for ; Fri, 5 Apr 2024 10:41:01 +0200 (CEST) Received: from pyrite.hamster-moth.ts.net (h175-177-049-156.catv02.itscom.jp [175.177.49.156]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E895463B; Fri, 5 Apr 2024 10:40:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1712306423; bh=3sLXFY+CIq9OnanWJwj9mKYaRM2wcu5JPatEZem3R/k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lT9b1yyjFRoVs05dznfba6zU0DQs36nn9Hz2YINuORB82RZzZ2Db8O+C2znuJNxLs ecStF8IyN06Eg1QrT/c6BgYU7giFLiQzJZORjXMUAPxEedy6ot5rHPhLnlfmuNFWrB UcKj0tas5QTT56xkNkZYDMKtawmNwlwtUj3IweQw= From: Paul Elder To: libcamera-devel@lists.libcamera.org Cc: Paul Elder Subject: [PATCH v2 1/3] ipa: libipa: Add Matrix class Date: Fri, 5 Apr 2024 17:40:48 +0900 Message-Id: <20240405084050.1919105-2-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240405084050.1919105-1-paul.elder@ideasonboard.com> References: <20240405084050.1919105-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add a class to represent a Matrix object and operations for adding matrices, multipling a matrix by a scalar, and multiplying two matrices. Signed-off-by: Paul Elder --- Changes in v2: - clean up unused includes - avoid dereferencing an absent std::optional --- src/ipa/libipa/matrix.cpp | 17 +++++ src/ipa/libipa/matrix.h | 136 +++++++++++++++++++++++++++++++++++++ src/ipa/libipa/meson.build | 2 + 3 files changed, 155 insertions(+) create mode 100644 src/ipa/libipa/matrix.cpp create mode 100644 src/ipa/libipa/matrix.h diff --git a/src/ipa/libipa/matrix.cpp b/src/ipa/libipa/matrix.cpp new file mode 100644 index 00000000..c222c3f0 --- /dev/null +++ b/src/ipa/libipa/matrix.cpp @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ +/* + * Copyright (C) 2019, Raspberry Pi Ltd + * Copyright (C) 2024, Paul Elder + * + * matrix.cpp - Matrix and related operations + */ + +#include "matrix.h" + +#include + +namespace libcamera { + +LOG_DEFINE_CATEGORY(Matrix) + +} /* namespace libcamera */ diff --git a/src/ipa/libipa/matrix.h b/src/ipa/libipa/matrix.h new file mode 100644 index 00000000..f5520260 --- /dev/null +++ b/src/ipa/libipa/matrix.h @@ -0,0 +1,136 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ +/* + * Copyright (C) 2019, Raspberry Pi Ltd + * Copyright (C) 2024, Paul Elder + * + * matrix.cpp - Matrix and related operations + */ +#pragma once + +#include +#include +#include + +#include + +#include "libcamera/internal/yaml_parser.h" + +namespace libcamera { + +LOG_DECLARE_CATEGORY(Matrix) + +namespace ipa { + +template +struct Matrix { +public: + Matrix(){}; + ~Matrix(){}; + + Matrix(const unsigned int &_rows, const unsigned int &_cols, + const std::vector &_data) + : rows(_rows), cols(_cols) + { + for (const T &x : _data) + data.push_back(x); + + while (rows * cols < data.size()) + data.push_back(0); + } + + int readYaml(unsigned int _rows, unsigned int _cols, + const libcamera::YamlObject &yaml) + { + rows = _rows; + cols = _cols; + + if (yaml.size() != rows * cols) { + LOG(Matrix, Error) + << "Wrong number of values in matrix: expected " + << rows * cols << ", got " << yaml.size(); + return -EINVAL; + } + + for (const auto &x : yaml.asList()) { + auto value = x.get(); + if (!value) { + LOG(Matrix, Error) << "Failed to read matrix value"; + return -EINVAL; + } + data.push_back(*value); + } + + return 0; + } + + const std::string toString() const + { + std::stringstream ss; + ss << "Matrix { "; + for (unsigned int i = 0; i < rows; i++) { + ss << "[ "; + for (unsigned int j = 0; j < cols; j++) { + ss << data[i * cols + j]; + ss << ((j + 1 < cols) ? ", " : " "); + } + ss << ((i + 1 < rows) ? "], " : "]"); + } + ss << " }"; + + return ss.str(); + } + + const T &operator[](unsigned int i) const { return data.at(i); } + + unsigned int rows; + unsigned int cols; + std::vector data; +}; + +template +Matrix operator*(T d, const Matrix &m) +{ + std::vector result(m.data.size()); + + for (const T &x : m.data) + result.push_back(d * x); + + return Matrix(m.rows, m.cols, result); +} + +template +Matrix operator*(const Matrix &m1, const Matrix &m2) +{ + ASSERT(m1.cols == m2.rows); + + std::vector result(m1.rows * m2.cols); + + for (unsigned int i = 0; i < m1.rows; i++) { + T sum = 0; + + for (unsigned int j = 0; j < m2.cols; j++) + sum += m1[i * m1.cols + j] * m2[j * m2.cols + i]; + + result.push_back(sum); + } + + return Matrix(m1.rows, m2.cols, result); +} + +template +Matrix operator+(const Matrix &m1, const Matrix &m2) +{ + ASSERT(m1.cols == m2.cols && m1.rows == m2.rows); + + unsigned int len = m1.rows * m1.cols; + std::vector result(len); + + for (unsigned int i = 0; i < len; i++) + result[i] = m1[i] + m2[i]; + + return Matrix(m1.rows, m1.cols, result); +} + +} /* namespace ipa */ + +} /* namespace libcamera */ diff --git a/src/ipa/libipa/meson.build b/src/ipa/libipa/meson.build index 817a09cf..5d5ba5e5 100644 --- a/src/ipa/libipa/meson.build +++ b/src/ipa/libipa/meson.build @@ -6,6 +6,7 @@ libipa_headers = files([ 'exposure_mode_helper.h', 'fc_queue.h', 'histogram.h', + 'matrix.h', 'module.h', 'pwl.h', ]) @@ -16,6 +17,7 @@ libipa_sources = files([ 'exposure_mode_helper.cpp', 'fc_queue.cpp', 'histogram.cpp', + 'matrix.cpp', 'module.cpp', 'pwl.cpp' ]) From patchwork Fri Apr 5 08:40:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 19848 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id DA5EFBD16B for ; Fri, 5 Apr 2024 08:41:06 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7CC7F6333E; Fri, 5 Apr 2024 10:41:06 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="HKqBkw0M"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5999B63334 for ; Fri, 5 Apr 2024 10:41:03 +0200 (CEST) Received: from pyrite.hamster-moth.ts.net (h175-177-049-156.catv02.itscom.jp [175.177.49.156]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 8FBA122A; Fri, 5 Apr 2024 10:40:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1712306424; bh=S2Zw/tr9WLjjidfR5SKOdbcR9ffxg0vS8O9YtknOcl4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HKqBkw0Mt6lWO9P17dmAPCRtPZuWkKTNLk1c9Z1XCrbV8N+UpJO6lydqqmyhXP6q7 i80KyB9bd+QBRGhGzRSsVKb8T3eLP2GCta46ljHy89OX059TelRbQVGGluO4lNevQ3 PLhwXgLTYrVpaDxUMbl5bo1Wokb8gfJi/K0aOrV0= From: Paul Elder To: libcamera-devel@lists.libcamera.org Cc: Paul Elder Subject: [PATCH 2/3] ipa: libipa: Add MatrixInterpolator class Date: Fri, 5 Apr 2024 17:40:49 +0900 Message-Id: <20240405084050.1919105-3-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240405084050.1919105-1-paul.elder@ideasonboard.com> References: <20240405084050.1919105-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add a class to encapsulate the functionality of fetching a matrix based on an integer key, and interpolating if there is no exact match. This is expected to be used by both color correction matrices / crosstalk correction as well as lens shading correction. Signed-off-by: Paul Elder --- src/ipa/libipa/matrix_interpolator.cpp | 54 +++++++++++++++ src/ipa/libipa/matrix_interpolator.h | 94 ++++++++++++++++++++++++++ src/ipa/libipa/meson.build | 2 + 3 files changed, 150 insertions(+) create mode 100644 src/ipa/libipa/matrix_interpolator.cpp create mode 100644 src/ipa/libipa/matrix_interpolator.h diff --git a/src/ipa/libipa/matrix_interpolator.cpp b/src/ipa/libipa/matrix_interpolator.cpp new file mode 100644 index 00000000..394633b5 --- /dev/null +++ b/src/ipa/libipa/matrix_interpolator.cpp @@ -0,0 +1,54 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ +/* + * Copyright (C) 2019, Raspberry Pi Ltd + * Copyright (C) 2024, Paul Elder + * + * matrix_interpolator.cpp - Helper class for interpolating maps of matrices + */ +#include "matrix_interpolator.h" + +#include +#include + +#include + +#include "libcamera/internal/yaml_parser.h" + +#include "matrix.h" + +/** + * \file ccm.h + * \brief Helper class for interpolating maps of matrices + */ + +namespace libcamera { + +LOG_DEFINE_CATEGORY(MatrixInterpolator) + +namespace ipa { + +/** + * \class MatrixInterpolator + * \brief Class for storing, retrieving, and interpolating matrices + */ + +/** + * \fn int MatrixInterpolator::readYaml(const libcamera::YamlObject &yaml) + * \brief Initialize an MatrixInterpolator instance from yaml + * \tparam T Type of data stored in the matrices + * \tparam R Number of rows of the matrices + * \tparam C Number of columns of the matrices + * \param[in] yaml The yaml object that contains the map of unsigned integers to matrices + * \return Zero on success, negative error code otherwise + */ + +/** + * \fn Matrix MatrixInterpolator::get(unsigned int key) + * \brief Retrieve a matrix from the list of matrices, interpolating if necessary + * \param[in] key The unsigned integer key of the matrix to retrieve + * \return The matrix corresponding to the color temperature + */ + +} /* namespace ipa */ + +} /* namespace libcamera */ diff --git a/src/ipa/libipa/matrix_interpolator.h b/src/ipa/libipa/matrix_interpolator.h new file mode 100644 index 00000000..2cd4ff75 --- /dev/null +++ b/src/ipa/libipa/matrix_interpolator.h @@ -0,0 +1,94 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ +/* + * Copyright (C) 2019, Raspberry Pi Ltd + * Copyright (C) 2024, Paul Elder + * + * matrix_interpolator.h - Helper class for interpolating maps of matrices + */ + +#pragma once + +#include +#include +#include +#include + +#include + +#include "libcamera/internal/yaml_parser.h" + +#include "matrix.h" + +namespace libcamera { + +LOG_DECLARE_CATEGORY(MatrixInterpolator) + +namespace ipa { + +template +class MatrixInterpolator +{ +public: + MatrixInterpolator(){}; + ~MatrixInterpolator(){}; + + int readYaml(const libcamera::YamlObject &yaml) + { + int ret; + + if (!yaml.isDictionary()) { + LOG(MatrixInterpolator, Error) << "yaml object must be a dictionary"; + return -EINVAL; + } + + for (const auto &[ctStr, value] : yaml.asDict()) { + unsigned int ct = std::stoul(ctStr); + Matrix matrix; + if ((ret = matrix.readYaml(R, C, value)) < 0) { + LOG(MatrixInterpolator, Error) << "Failed to read matrix"; + return ret; + } + + matrices_[ct] = matrix; + + LOG(MatrixInterpolator, Debug) + << "Read matrix for key " << ct << ": " + << matrices_[ct].toString(); + } + + if (matrices_.size() < 1) { + LOG(MatrixInterpolator, Error) << "Need at least one matrix"; + return -EINVAL; + } + + return 0; + } + + Matrix get(unsigned int ct) + { + if (matrices_.size() == 1 || + ct <= matrices_.begin()->first) + return matrices_.begin()->second; + + if (ct >= matrices_.rbegin()->first) + return matrices_.rbegin()->second; + + if (matrices_.count(ct)) + return matrices_[ct]; + + /* The above four guarantee that this will succeed */ + auto iter = matrices_.upper_bound(ct); + unsigned int ctUpper = iter->first; + unsigned int ctLower = (--iter)->first; + + double lambda = (ct - ctLower) / (ctUpper - ctLower); + return lambda * matrices_[ctUpper] + (1.0 - lambda) * matrices_[ctLower]; + } + +private: + std::map> matrices_; +}; + +} /* namespace ipa */ + +} /* namespace libcamera */ diff --git a/src/ipa/libipa/meson.build b/src/ipa/libipa/meson.build index 5d5ba5e5..128de712 100644 --- a/src/ipa/libipa/meson.build +++ b/src/ipa/libipa/meson.build @@ -3,6 +3,7 @@ libipa_headers = files([ 'algorithm.h', 'camera_sensor_helper.h', + 'matrix_interpolator.h', 'exposure_mode_helper.h', 'fc_queue.h', 'histogram.h', @@ -14,6 +15,7 @@ libipa_headers = files([ libipa_sources = files([ 'algorithm.cpp', 'camera_sensor_helper.cpp', + 'matrix_interpolator.cpp', 'exposure_mode_helper.cpp', 'fc_queue.cpp', 'histogram.cpp', From patchwork Fri Apr 5 08:40:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 19849 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id BEC2DC32C9 for ; Fri, 5 Apr 2024 08:41:07 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 536F061C31; Fri, 5 Apr 2024 10:41:07 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="IcBtboG7"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 97CC061C24 for ; Fri, 5 Apr 2024 10:41:04 +0200 (CEST) Received: from pyrite.hamster-moth.ts.net (h175-177-049-156.catv02.itscom.jp [175.177.49.156]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 36CBA63B; Fri, 5 Apr 2024 10:40:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1712306426; bh=NyFx1aiDeiWFAJD2G8nufGw7e/V4dxfo3KbqxcToZSU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IcBtboG72If/h1oyykfZWGtn2zMMGY6MvEZjV5ma6yaEIwKyDlU6y8LY/H9quXVoP C6AoOLDmbrBgLNI5P+o+jSH2xOGYCIJcN+EnMMX3lPUWRo6/MiMrwzhai9Y28Hxqml IpUUE2xgGSNHuc/MkavX4rYjOwIiV4tmYiMYnivc= From: Paul Elder To: libcamera-devel@lists.libcamera.org Cc: Paul Elder Subject: [PATCH 3/3] ipa: rkisp1: algorithms: Add crosstalk algorithm Date: Fri, 5 Apr 2024 17:40:50 +0900 Message-Id: <20240405084050.1919105-4-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240405084050.1919105-1-paul.elder@ideasonboard.com> References: <20240405084050.1919105-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add an algorithm module to the rkisp1 IPA for crosstalk correction. Signed-off-by: Paul Elder --- src/ipa/rkisp1/algorithms/ctk.cpp | 98 +++++++++++++++++++++++++++ src/ipa/rkisp1/algorithms/ctk.h | 41 +++++++++++ src/ipa/rkisp1/algorithms/meson.build | 1 + 3 files changed, 140 insertions(+) create mode 100644 src/ipa/rkisp1/algorithms/ctk.cpp create mode 100644 src/ipa/rkisp1/algorithms/ctk.h diff --git a/src/ipa/rkisp1/algorithms/ctk.cpp b/src/ipa/rkisp1/algorithms/ctk.cpp new file mode 100644 index 00000000..76f5da93 --- /dev/null +++ b/src/ipa/rkisp1/algorithms/ctk.cpp @@ -0,0 +1,98 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2024, Ideas On Board + * + * ctk.cpp - RkISP1 Cross Talk Correction control algorithm + */ + +#include "ctk.h" + +#include +#include +#include +#include +#include + +#include +#include + +#include + +#include "libcamera/internal/yaml_parser.h" + +#include "libipa/matrix_interpolator.h" + +/** + * \file ctk.h + */ + +namespace libcamera { + +namespace ipa::rkisp1::algorithms { + +/** + * \class Ctk + * \brief A cross talk correction algorithm + */ + +LOG_DEFINE_CATEGORY(RkISP1Ctk) + +int Ctk::parseYaml(const YamlObject &tuningData, const char *prop) +{ + int ret = 0; + + const YamlObject &yaml = tuningData[prop]; + ret = ccm_.readYaml(yaml); + if (ret < 0) { + LOG(RkISP1Ctk, Error) + << "Failed to parse '" << prop << "' parameter from tuning file"; + } + + return ret; +} + +/** + * \copydoc libcamera::ipa::Algorithm::init + */ +int Ctk::init([[maybe_unused]] IPAContext &context, const YamlObject &tuningData) +{ + return parseYaml(tuningData, "ctms"); +} + +void Ctk::setParameters(rkisp1_params_cfg *params, const Matrix &matrix) +{ + struct rkisp1_cif_isp_ctk_config &config = params->others.ctk_config; + + /* + * 4 bit integer and 7 bit fractional, ranging from -8 (0x400) to + * +7.992 (0x3FF) + */ + for (unsigned int i = 0; i < 3; i++) + for (unsigned int j = 0; j < 3; j++) + config.coeff[i][j] = static_cast(matrix.data[i * 3 + j]); + + LOG(RkISP1Ctk, Debug) << "Setting matrix " << matrix.toString(); + + params->module_en_update |= RKISP1_CIF_ISP_MODULE_CTK; + params->module_ens |= RKISP1_CIF_ISP_MODULE_CTK; + params->module_cfg_update |= RKISP1_CIF_ISP_MODULE_CTK; +} + +/** + * \copydoc libcamera::ipa::Algorithm::prepare + */ +void Ctk::prepare(IPAContext &context, [[maybe_unused]] const uint32_t frame, + [[maybe_unused]] IPAFrameContext &frameContext, + rkisp1_params_cfg *params) +{ + uint32_t ct = context.activeState.awb.temperatureK; + Matrix ccm = ccm_.get(ct); + + setParameters(params, ccm); +} + +REGISTER_IPA_ALGORITHM(Ctk, "Ctk") + +} /* namespace ipa::rkisp1::algorithms */ + +} /* namespace libcamera */ diff --git a/src/ipa/rkisp1/algorithms/ctk.h b/src/ipa/rkisp1/algorithms/ctk.h new file mode 100644 index 00000000..4f429df4 --- /dev/null +++ b/src/ipa/rkisp1/algorithms/ctk.h @@ -0,0 +1,41 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2024, Ideas On Board + * + * ctk.h - RkISP1 Cross Talk Correction control algorithm + */ + +#pragma once + +#include + +#include "libipa/matrix.h" +#include "libipa/matrix_interpolator.h" + +#include "algorithm.h" + +namespace libcamera { + +namespace ipa::rkisp1::algorithms { + +class Ctk : public Algorithm +{ +public: + Ctk(){}; + ~Ctk() = default; + + int init(IPAContext &context, const YamlObject &tuningData) override; + void prepare(IPAContext &context, const uint32_t frame, + IPAFrameContext &frameContext, + rkisp1_params_cfg *params) override; + +private: + int parseYaml(const YamlObject &tuningData, const char *prop); + void setParameters(rkisp1_params_cfg *params, const Matrix &matrix); + + MatrixInterpolator ccm_; +}; + +} /* namespace ipa::rkisp1::algorithms */ + +} /* namespace libcamera */ diff --git a/src/ipa/rkisp1/algorithms/meson.build b/src/ipa/rkisp1/algorithms/meson.build index 93a48329..c9891e87 100644 --- a/src/ipa/rkisp1/algorithms/meson.build +++ b/src/ipa/rkisp1/algorithms/meson.build @@ -4,6 +4,7 @@ rkisp1_ipa_algorithms = files([ 'agc.cpp', 'awb.cpp', 'blc.cpp', + 'ctk.cpp', 'cproc.cpp', 'dpcc.cpp', 'dpf.cpp',