{"id":20005,"url":"https://patchwork.libcamera.org/api/1.1/patches/20005/?format=json","web_url":"https://patchwork.libcamera.org/patch/20005/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","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-3-paul.elder@ideasonboard.com>","date":"2024-05-07T06:10:15","name":"[v3,2/3] ipa: libipa: Add MatrixInterpolator class","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"a82bb084130cb26c22566b41e8b5d06c5089d30c","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/20005/mbox/","series":[{"id":4290,"url":"https://patchwork.libcamera.org/api/1.1/series/4290/?format=json","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/20005/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/20005/checks/","tags":{},"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 C1BBDBDE6B\n\tfor ;\n\tTue, 7 May 2024 06:10:40 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D10BA6342A;\n\tTue, 7 May 2024 08:10:38 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id ED84863432\n\tfor ;\n\tTue, 7 May 2024 08:10:35 +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 E7D923D5;\n\tTue, 7 May 2024 08:10:32 +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=\"HJgLLWpb\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1715062233;\n\tbh=rFP6v0E5TSA9mNmiwSIdGTsGFZKjWQssLZsB1JgyRMc=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=HJgLLWpb7fG/jDFaB7eE4/FxfMVXVgiww4FCQsaw40ztGam0zl0xEzAmz7OQAIde1\n\tIEyxuKHDQjeXJwGEvKnmlq4QXz6CZuiTZRO7P0etWmDPYgu3wEB+vWwRRLrwgDZZQy\n\tRBfIDJ7pLJZWbIAbvJAX4wZjQaHjDQ3uddgls8No=","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","Content-Transfer-Encoding":"8bit","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\" "},"content":"Add a class to encapsulate the functionality of fetching a matrix based\non an integer key, and interpolating if there is no exact match. This is\nexpected to be used by both color correction matrices / crosstalk\ncorrection as well as lens shading correction.\n\nSigned-off-by: Paul Elder \n\n---\nChanges in v3:\n- add a constructor that takes a map of unsigned int -> matrix\n- s/unit/identity\n- clear matrices on reset and when reading from yaml\n- add assert at get()\n\nChanges in v2:\n- initialize to identity matrix\n- add a function to reset to identity matrix\n- other minor fixes\n---\n src/ipa/libipa/matrix_interpolator.cpp | 54 ++++++++++++\n src/ipa/libipa/matrix_interpolator.h | 116 +++++++++++++++++++++++++\n src/ipa/libipa/meson.build | 2 +\n 3 files changed, 172 insertions(+)\n create mode 100644 src/ipa/libipa/matrix_interpolator.cpp\n create mode 100644 src/ipa/libipa/matrix_interpolator.h","diff":"diff --git a/src/ipa/libipa/matrix_interpolator.cpp b/src/ipa/libipa/matrix_interpolator.cpp\nnew file mode 100644\nindex 00000000..fc1837e7\n--- /dev/null\n+++ b/src/ipa/libipa/matrix_interpolator.cpp\n@@ -0,0 +1,54 @@\n+/* SPDX-License-Identifier: BSD-2-Clause */\n+/*\n+ * Copyright (C) 2019, Raspberry Pi Ltd\n+ * Copyright (C) 2024, Paul Elder \n+ *\n+ * matrix_interpolator.cpp - Helper class for interpolating maps of matrices\n+ */\n+#include \"matrix_interpolator.h\"\n+\n+#include \n+#include \n+\n+#include \n+\n+#include \"libcamera/internal/yaml_parser.h\"\n+\n+#include \"matrix.h\"\n+\n+/**\n+ * \\file ccm.h\n+ * \\brief Helper class for interpolating maps of matrices\n+ */\n+\n+namespace libcamera {\n+\n+LOG_DEFINE_CATEGORY(MatrixInterpolator)\n+\n+namespace ipa {\n+\n+/**\n+ * \\class MatrixInterpolator\n+ * \\brief Class for storing, retrieving, and interpolating matrices\n+ */\n+\n+/**\n+ * \\fn int MatrixInterpolator::readYaml(const libcamera::YamlObject &yaml)\n+ * \\brief Initialize an MatrixInterpolator instance from yaml\n+ * \\tparam T Type of data stored in the matrices\n+ * \\tparam R Number of rows of the matrices\n+ * \\tparam C Number of columns of the matrices\n+ * \\param[in] yaml The yaml object that contains the map of unsigned integers to matrices\n+ * \\return Zero on success, negative error code otherwise\n+ */\n+\n+/**\n+ * \\fn Matrix MatrixInterpolator::get(unsigned int key)\n+ * \\brief Retrieve a matrix from the list of matrices, interpolating if necessary\n+ * \\param[in] key The unsigned integer key of the matrix to retrieve\n+ * \\return The matrix corresponding to the color temperature\n+ */\n+\n+} /* namespace ipa */\n+\n+} /* namespace libcamera */\ndiff --git a/src/ipa/libipa/matrix_interpolator.h b/src/ipa/libipa/matrix_interpolator.h\nnew file mode 100644\nindex 00000000..2c6263cb\n--- /dev/null\n+++ b/src/ipa/libipa/matrix_interpolator.h\n@@ -0,0 +1,116 @@\n+/* SPDX-License-Identifier: BSD-2-Clause */\n+/*\n+ * Copyright (C) 2019, Raspberry Pi Ltd\n+ * Copyright (C) 2024, Paul Elder \n+ *\n+ * matrix_interpolator.h - Helper class for interpolating maps of matrices\n+ */\n+\n+#pragma once\n+\n+#include \n+#include \n+#include \n+#include \n+\n+#include \n+\n+#include \"libcamera/internal/yaml_parser.h\"\n+\n+#include \"matrix.h\"\n+\n+namespace libcamera {\n+\n+LOG_DECLARE_CATEGORY(MatrixInterpolator)\n+\n+namespace ipa {\n+\n+template> * = nullptr>\n+class MatrixInterpolator\n+{\n+public:\n+\tMatrixInterpolator()\n+\t{\n+\t\treset();\n+\t};\n+\n+\tMatrixInterpolator(const std::map> &matrices)\n+\t{\n+\t\tfor (const auto &pair : matrices)\n+\t\t\tmatrices_[pair.first] = pair.second;\n+\t};\n+\n+\t~MatrixInterpolator(){};\n+\n+\tvoid reset()\n+\t{\n+\t\tMatrix identity;\n+\t\tmatrices_.clear();\n+\t\tmatrices_[0] = identity;\n+\t}\n+\n+\tint readYaml(const libcamera::YamlObject &yaml)\n+\t{\n+\t\tint ret;\n+\n+\t\tmatrices_.clear();\n+\n+\t\tif (!yaml.isDictionary()) {\n+\t\t\tLOG(MatrixInterpolator, Error) << \"yaml object must be a dictionary\";\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tfor (const auto &[ctStr, value] : yaml.asDict()) {\n+\t\t\tunsigned int ct = std::stoul(ctStr);\n+\t\t\tMatrix matrix;\n+\t\t\tif ((ret = matrix.readYaml(value)) < 0) {\n+\t\t\t\tLOG(MatrixInterpolator, Error) << \"Failed to read matrix\";\n+\t\t\t\treturn ret;\n+\t\t\t}\n+\n+\t\t\tmatrices_[ct] = matrix;\n+\n+\t\t\tLOG(MatrixInterpolator, Debug)\n+\t\t\t\t<< \"Read matrix for key \" << ct << \": \"\n+\t\t\t\t<< matrices_[ct].toString();\n+\t\t}\n+\n+\t\tif (matrices_.size() < 1) {\n+\t\t\tLOG(MatrixInterpolator, Error) << \"Need at least one matrix\";\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\treturn 0;\n+\t}\n+\n+\tMatrix get(unsigned int ct)\n+\t{\n+\t\tASSERT(matrices_.size() > 0);\n+\n+\t\tif (matrices_.size() == 1 ||\n+\t\t ct <= matrices_.begin()->first)\n+\t\t\treturn matrices_.begin()->second;\n+\n+\t\tif (ct >= matrices_.rbegin()->first)\n+\t\t\treturn matrices_.rbegin()->second;\n+\n+\t\tif (matrices_.count(ct))\n+\t\t\treturn matrices_[ct];\n+\n+\t\t/* The above four guarantee that this will succeed */\n+\t\tauto iter = matrices_.upper_bound(ct);\n+\t\tunsigned int ctUpper = iter->first;\n+\t\tunsigned int ctLower = (--iter)->first;\n+\n+\t\tdouble lambda = (ct - ctLower) / static_cast(ctUpper - ctLower);\n+\t\treturn lambda * matrices_[ctUpper] + (1.0 - lambda) * matrices_[ctLower];\n+\t}\n+\n+private:\n+\tstd::map> matrices_;\n+};\n+\n+} /* namespace ipa */\n+\n+} /* namespace libcamera */\ndiff --git a/src/ipa/libipa/meson.build b/src/ipa/libipa/meson.build\nindex 1e34355f..305acf64 100644\n--- a/src/ipa/libipa/meson.build\n+++ b/src/ipa/libipa/meson.build\n@@ -8,6 +8,7 @@ libipa_headers = files([\n 'fc_queue.h',\n 'histogram.h',\n 'matrix.h',\n+ 'matrix_interpolator.h',\n 'module.h',\n 'pwl.h',\n ])\n@@ -20,6 +21,7 @@ libipa_sources = files([\n 'fc_queue.cpp',\n 'histogram.cpp',\n 'matrix.cpp',\n+ 'matrix_interpolator.cpp',\n 'module.cpp',\n 'pwl.cpp'\n ])\n","prefixes":["v3","2/3"]}