From patchwork Tue May 7 06:10:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 20004 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 A3A25C328F for ; Tue, 7 May 2024 06:10:38 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9FCF7633FA; Tue, 7 May 2024 08:10:35 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="NSMqBq4P"; 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 24047633DF for ; Tue, 7 May 2024 08:10:34 +0200 (CEST) Received: from neptunite.hamster-moth.ts.net (h175-177-049-156.catv02.itscom.jp [175.177.49.156]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 51DB83D5; Tue, 7 May 2024 08:10:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1715062232; bh=hwiBWuyMwn+gwH0q0udnQLs1JJLEaRP1aKYdzQZb3D0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NSMqBq4PuE3VCdO52mtw4UExiRtgN+foRjQzQhYvnxu3ya72t0amhhaKEO+K0vESn IHxjtuFbHBq/16cBMYr919J1R5Oq5oU45TEZMZ2FLfoxRk3f0rfZO3lgIq8R71SnvB I06WzCtf3hxHB0g5IaEzi50VV2oLy5mkVsTPHvFI= From: Paul Elder To: libcamera-devel@lists.libcamera.org Cc: Paul Elder Subject: [PATCH v3 1/3] ipa: libipa: Add Matrix class Date: Tue, 7 May 2024 15:10:14 +0900 Message-Id: <20240507061016.1716450-2-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 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 Reviewed-by: Stefan Klug --- Changes in v3: - fix template parameters of operator* to allow different types for the scalar multiplier and the matrix's number type - clear data in constructors - fix assert in constructor Changes v2: - make rows and columns into template arguments - initialize to identity matrix on construction - add getter and setter - change from struct to class - fix matrix multiplication - clean up unused includes - avoid dereferencing an absent std::optional --- src/ipa/libipa/matrix.cpp | 17 +++++ src/ipa/libipa/matrix.h | 146 +++++++++++++++++++++++++++++++++++++ src/ipa/libipa/meson.build | 2 + 3 files changed, 165 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..bbdb838b --- /dev/null +++ b/src/ipa/libipa/matrix.h @@ -0,0 +1,146 @@ +/* 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 + +#include "libcamera/internal/yaml_parser.h" + +namespace libcamera { + +LOG_DECLARE_CATEGORY(Matrix) + +namespace ipa { + +template> * = nullptr> +class Matrix +{ +public: + Matrix() + { + data_.clear(); + for (unsigned int i = 0; i < R; i++) + for (unsigned int j = 0; j < C; j++) + data_.push_back(static_cast(i == j)); + }; + + Matrix(const std::vector &data) + { + ASSERT(data.size() == R * C); + + data_.clear(); + for (const T &x : data) + data_.push_back(x); + } + + ~Matrix(){}; + + int readYaml(const libcamera::YamlObject &yaml) + { + if (yaml.size() != R * C) { + LOG(Matrix, Error) + << "Wrong number of values in matrix: expected " + << R * C << ", got " << yaml.size(); + return -EINVAL; + } + + unsigned int i = 0; + for (const auto &x : yaml.asList()) { + auto value = x.get(); + if (!value) { + LOG(Matrix, Error) << "Failed to read matrix value"; + return -EINVAL; + } + + data_[i++] = *value; + } + + return 0; + } + + const std::string toString() const + { + std::stringstream ss; + ss << "Matrix { "; + for (unsigned int i = 0; i < R; i++) { + ss << "[ "; + for (unsigned int j = 0; j < C; j++) { + ss << get(i, j); + ss << ((j + 1 < C) ? ", " : " "); + } + ss << ((i + 1 < R) ? "], " : "]"); + } + ss << " }"; + + return ss.str(); + } + + const T &get(unsigned int i, unsigned int j) const { return data_.at(i * C + j); } + void set(unsigned int i, unsigned int j, T value) { data_[i * C + j] = value; } + +private: + std::vector data_; +}; + +template && std::is_arithmetic_v> * = nullptr> +Matrix operator*(T d, const Matrix &m) +{ + Matrix result; + + for (unsigned int i = 0; i < R; i++) + for (unsigned int j = 0; j < C; j++) + result.set(i, j, d * m.get(i, j)); + + return result; +} + +template && C1 == R2> * = nullptr> +Matrix operator*(const Matrix &m1, const Matrix &m2) +{ + Matrix result; + + for (unsigned int i = 0; i < R1; i++) { + for (unsigned int j = 0; j < C2; j++) { + T sum = 0; + + for (unsigned int k = 0; k < C1; k++) + sum += m1.get(i, k) * m2.get(k, j); + + result.set(i, j, sum); + } + } + + return result; +} + +template> * = nullptr> +Matrix operator+(const Matrix &m1, const Matrix &m2) +{ + Matrix result; + + for (unsigned int i = 0; i < R; i++) + for (unsigned int j = 0; j < C; j++) + result.set(i, j, m1.get(i, j) + m2.get(i, j)); + + return result; +} + +} /* namespace ipa */ + +} /* namespace libcamera */ diff --git a/src/ipa/libipa/meson.build b/src/ipa/libipa/meson.build index 1b3faf8d..1e34355f 100644 --- a/src/ipa/libipa/meson.build +++ b/src/ipa/libipa/meson.build @@ -7,6 +7,7 @@ libipa_headers = files([ 'exposure_mode_helper.h', 'fc_queue.h', 'histogram.h', + 'matrix.h', 'module.h', 'pwl.h', ]) @@ -18,6 +19,7 @@ libipa_sources = files([ 'exposure_mode_helper.cpp', 'fc_queue.cpp', 'histogram.cpp', + 'matrix.cpp', 'module.cpp', 'pwl.cpp' ]) From patchwork Tue May 7 06:10:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 20005 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 C1BBDBDE6B for ; Tue, 7 May 2024 06:10:40 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D10BA6342A; Tue, 7 May 2024 08:10:38 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="HJgLLWpb"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id ED84863432 for ; Tue, 7 May 2024 08:10:35 +0200 (CEST) Received: from neptunite.hamster-moth.ts.net (h175-177-049-156.catv02.itscom.jp [175.177.49.156]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E7D923D5; Tue, 7 May 2024 08:10:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1715062233; bh=rFP6v0E5TSA9mNmiwSIdGTsGFZKjWQssLZsB1JgyRMc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HJgLLWpb7fG/jDFaB7eE4/FxfMVXVgiww4FCQsaw40ztGam0zl0xEzAmz7OQAIde1 IEyxuKHDQjeXJwGEvKnmlq4QXz6CZuiTZRO7P0etWmDPYgu3wEB+vWwRRLrwgDZZQy RBfIDJ7pLJZWbIAbvJAX4wZjQaHjDQ3uddgls8No= From: Paul Elder To: libcamera-devel@lists.libcamera.org Cc: Paul Elder Subject: [PATCH v3 2/3] ipa: libipa: Add MatrixInterpolator class Date: Tue, 7 May 2024 15:10:15 +0900 Message-Id: <20240507061016.1716450-3-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 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 --- Changes in v3: - add a constructor that takes a map of unsigned int -> matrix - s/unit/identity - clear matrices on reset and when reading from yaml - add assert at get() Changes in v2: - initialize to identity matrix - add a function to reset to identity matrix - other minor fixes --- src/ipa/libipa/matrix_interpolator.cpp | 54 ++++++++++++ src/ipa/libipa/matrix_interpolator.h | 116 +++++++++++++++++++++++++ src/ipa/libipa/meson.build | 2 + 3 files changed, 172 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..fc1837e7 --- /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..2c6263cb --- /dev/null +++ b/src/ipa/libipa/matrix_interpolator.h @@ -0,0 +1,116 @@ +/* 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> * = nullptr> +class MatrixInterpolator +{ +public: + MatrixInterpolator() + { + reset(); + }; + + MatrixInterpolator(const std::map> &matrices) + { + for (const auto &pair : matrices) + matrices_[pair.first] = pair.second; + }; + + ~MatrixInterpolator(){}; + + void reset() + { + Matrix identity; + matrices_.clear(); + matrices_[0] = identity; + } + + int readYaml(const libcamera::YamlObject &yaml) + { + int ret; + + matrices_.clear(); + + 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(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) + { + ASSERT(matrices_.size() > 0); + + 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) / static_cast(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 1e34355f..305acf64 100644 --- a/src/ipa/libipa/meson.build +++ b/src/ipa/libipa/meson.build @@ -8,6 +8,7 @@ libipa_headers = files([ 'fc_queue.h', 'histogram.h', 'matrix.h', + 'matrix_interpolator.h', 'module.h', 'pwl.h', ]) @@ -20,6 +21,7 @@ libipa_sources = files([ 'fc_queue.cpp', 'histogram.cpp', 'matrix.cpp', + 'matrix_interpolator.cpp', 'module.cpp', 'pwl.cpp' ]) From patchwork Tue May 7 06:10:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 20006 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 28743C32C9 for ; Tue, 7 May 2024 06:10:42 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3431463436; Tue, 7 May 2024 08:10:41 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="RI5MklQQ"; 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 5C4AA633DF for ; Tue, 7 May 2024 08:10:37 +0200 (CEST) Received: from neptunite.hamster-moth.ts.net (h175-177-049-156.catv02.itscom.jp [175.177.49.156]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 861E93D5; Tue, 7 May 2024 08:10:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1715062235; bh=AkgkWex9BhnvKKfyZRMsddIeKCew0HtYW9ftOGJMmyw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RI5MklQQUhG70rEAidfHCcmt2nGVQqOu9lmmyXcvQxkIxmYZxmoJyNbFGgUIMf3l8 qYmYrPtDzaTgV9yOGo3x/FHx3VgWVvOvnGxQJbpEf0sCDI09h4jm46MT9Wqzp2Kpss +wKFGdGyqshL9rmzbk1TfuC3S5PKoVbl3XEIg8Xs= From: Paul Elder To: libcamera-devel@lists.libcamera.org Cc: Paul Elder 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 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 --- This patch depends on "[PATCH] libcamera: utils: Add a helper to convert floating-point to fixed-point" Changes in v3: - read ccm offsets from tuning data, and write these offsets to the parameters buffer - make parseYaml return void, as it should fill in default data if unable to read, thus never failing Changes in v2: - rename ctk to ccm - reset the matrix interpolator to identity matrix if failed to read from tuning file --- src/ipa/rkisp1/algorithms/ccm.cpp | 116 ++++++++++++++++++++++++++ src/ipa/rkisp1/algorithms/ccm.h | 44 ++++++++++ src/ipa/rkisp1/algorithms/meson.build | 1 + 3 files changed, 161 insertions(+) create mode 100644 src/ipa/rkisp1/algorithms/ccm.cpp create mode 100644 src/ipa/rkisp1/algorithms/ccm.h diff --git a/src/ipa/rkisp1/algorithms/ccm.cpp b/src/ipa/rkisp1/algorithms/ccm.cpp new file mode 100644 index 00000000..11fa5ec2 --- /dev/null +++ b/src/ipa/rkisp1/algorithms/ccm.cpp @@ -0,0 +1,116 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2024, Ideas On Board + * + * ccm.cpp - RkISP1 Cross Talk Correction control algorithm + */ + +#include "ccm.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 Ccm + * \brief A cross talk correction algorithm + */ + +LOG_DEFINE_CATEGORY(RkISP1Ccm) + +void Ccm::parseYaml(const YamlObject &tuningData) +{ + int ret = ccm_.readYaml(tuningData["ccms"]); + if (ret < 0) { + LOG(RkISP1Ccm, Warning) + << "Failed to parse 'ccms' " + << "parameter from tuning file; falling back to unit matrix"; + ccm_.reset(); + } + + ret = offsets_.readYaml(tuningData["offsets"]); + if (ret < 0) { + LOG(RkISP1Ccm, Warning) + << "Failed to parse 'offsets' " + << "parameter from tuning file; falling back to zero offsets"; + const std::map> offsets = { + { 0, Matrix({ 0, 0, 0 }) } + }; + MatrixInterpolator interpolator(offsets); + offsets_ = interpolator; + } +} + +/** + * \copydoc libcamera::ipa::Algorithm::init + */ +int Ccm::init([[maybe_unused]] IPAContext &context, const YamlObject &tuningData) +{ + parseYaml(tuningData); + return 0; +} + +void Ccm::setParameters(rkisp1_params_cfg *params, + const Matrix &matrix, + const Matrix &offsets) +{ + 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] = + utils::floatingToFixedPoint<4, 7, uint16_t, double>(matrix.get(i, j)); + + for (unsigned int i = 0; i < 3; i++) + config.ct_offset[i] = offsets.get(i, 0) & 0xFFF; + + LOG(RkISP1Ccm, Debug) << "Setting matrix " << matrix.toString(); + LOG(RkISP1Ccm, Debug) << "Setting offsets " << offsets.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 Ccm::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); + Matrix offsets = offsets_.get(ct); + + setParameters(params, ccm, offsets); +} + +REGISTER_IPA_ALGORITHM(Ccm, "Ccm") + +} /* namespace ipa::rkisp1::algorithms */ + +} /* namespace libcamera */ diff --git a/src/ipa/rkisp1/algorithms/ccm.h b/src/ipa/rkisp1/algorithms/ccm.h new file mode 100644 index 00000000..dcab5cd3 --- /dev/null +++ b/src/ipa/rkisp1/algorithms/ccm.h @@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2024, Ideas On Board + * + * ccm.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 Ccm : public Algorithm +{ +public: + Ccm(){}; + ~Ccm() = 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: + void parseYaml(const YamlObject &tuningData); + void setParameters(rkisp1_params_cfg *params, + const Matrix &matrix, + const Matrix &offsets); + + MatrixInterpolator ccm_; + MatrixInterpolator offsets_; +}; + +} /* namespace ipa::rkisp1::algorithms */ + +} /* namespace libcamera */ diff --git a/src/ipa/rkisp1/algorithms/meson.build b/src/ipa/rkisp1/algorithms/meson.build index 93a48329..16de7133 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', + 'ccm.cpp', 'cproc.cpp', 'dpcc.cpp', 'dpf.cpp',