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',