Patch Detail
Show a patch.
GET /api/patches/19912/?format=api
{ "id": 19912, "url": "https://patchwork.libcamera.org/api/patches/19912/?format=api", "web_url": "https://patchwork.libcamera.org/patch/19912/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20240419071819.1325791-2-paul.elder@ideasonboard.com>", "date": "2024-04-19T07:18:17", "name": "[v2,1/3] ipa: libipa: Add Matrix class", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "41fcbdbaf60bcd393995192e10cd636dfa452a7b", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/19912/mbox/", "series": [ { "id": 4266, "url": "https://patchwork.libcamera.org/api/series/4266/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4266", "date": "2024-04-19T07:18:16", "name": "ipa: rkisp1: Add crosstalk algorithm", "version": 2, "mbox": "https://patchwork.libcamera.org/series/4266/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/19912/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/19912/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 6921CC328D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 19 Apr 2024 07:18:40 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 05E78633FC;\n\tFri, 19 Apr 2024 09:18:40 +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 0D076633EE\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 19 Apr 2024 09:18:37 +0200 (CEST)", "from pyrite.hamster-moth.ts.net (h175-177-049-156.catv02.itscom.jp\n\t[175.177.49.156])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B6AF9827;\n\tFri, 19 Apr 2024 09:17:47 +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=\"gOF1yulF\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1713511068;\n\tbh=b1UPiXCdoLp5ODwHqJe1H6/s9In6uVNtqK/ShN2dCcY=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=gOF1yulFXQgrFqwbMOr1Mo4tWoVdIJYpSrlLWQ87MyoHSWQn4CQVBK3tnGkMKHfrB\n\ts8z8uMXDn2oQjjeoroN4/6tv8CAEL46x9qxEQquDLClwh5xAtAWw7kOJgujGliNdWZ\n\tDrOLtkiPG39ejPwqa290Rj19/eJppaJCZxGczRPY=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Paul Elder <paul.elder@ideasonboard.com>", "Subject": "[PATCH v2 1/3] ipa: libipa: Add Matrix class", "Date": "Fri, 19 Apr 2024 16:18:17 +0900", "Message-Id": "<20240419071819.1325791-2-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.39.2", "In-Reply-To": "<20240419071819.1325791-1-paul.elder@ideasonboard.com>", "References": "<20240419071819.1325791-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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Add a class to represent a Matrix object and operations for adding\nmatrices, multipling a matrix by a scalar, and multiplying two matrices.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n---\nChanges in second v2 (v1 was a lone patch so we have two v2s of this\nspecific patch):\n- make rows and columns into template arguments\n- initialize to identity matrix on construction\n- add getter and setter\n- change from struct to class\n- fix matrix multiplication\n\nChanges in v2:\n- clean up unused includes\n- avoid dereferencing an absent std::optional\n---\n src/ipa/libipa/matrix.cpp | 17 +++++\n src/ipa/libipa/matrix.h | 144 +++++++++++++++++++++++++++++++++++++\n src/ipa/libipa/meson.build | 2 +\n 3 files changed, 163 insertions(+)\n create mode 100644 src/ipa/libipa/matrix.cpp\n create mode 100644 src/ipa/libipa/matrix.h", "diff": "diff --git a/src/ipa/libipa/matrix.cpp b/src/ipa/libipa/matrix.cpp\nnew file mode 100644\nindex 00000000..c222c3f0\n--- /dev/null\n+++ b/src/ipa/libipa/matrix.cpp\n@@ -0,0 +1,17 @@\n+/* SPDX-License-Identifier: BSD-2-Clause */\n+/*\n+ * Copyright (C) 2019, Raspberry Pi Ltd\n+ * Copyright (C) 2024, Paul Elder <paul.elder@ideasonboard.com>\n+ *\n+ * matrix.cpp - Matrix and related operations\n+ */\n+\n+#include \"matrix.h\"\n+\n+#include <libcamera/base/log.h>\n+\n+namespace libcamera {\n+\n+LOG_DEFINE_CATEGORY(Matrix)\n+\n+} /* namespace libcamera */\ndiff --git a/src/ipa/libipa/matrix.h b/src/ipa/libipa/matrix.h\nnew file mode 100644\nindex 00000000..ec41fb57\n--- /dev/null\n+++ b/src/ipa/libipa/matrix.h\n@@ -0,0 +1,144 @@\n+/* SPDX-License-Identifier: BSD-2-Clause */\n+/*\n+ * Copyright (C) 2019, Raspberry Pi Ltd\n+ * Copyright (C) 2024, Paul Elder <paul.elder@ideasonboard.com>\n+ *\n+ * matrix.cpp - Matrix and related operations\n+ */\n+#pragma once\n+\n+#include <algorithm>\n+#include <cmath>\n+#include <sstream>\n+#include <vector>\n+\n+#include <libcamera/base/log.h>\n+\n+#include \"libcamera/internal/yaml_parser.h\"\n+\n+namespace libcamera {\n+\n+LOG_DECLARE_CATEGORY(Matrix)\n+\n+namespace ipa {\n+\n+template<typename T, unsigned int R, unsigned int C,\n+\t std::enable_if_t<std::is_arithmetic_v<T>> * = nullptr>\n+class Matrix\n+{\n+public:\n+\tMatrix()\n+\t{\n+\t\tfor (unsigned int i = 0; i < R; i++)\n+\t\t\tfor (unsigned int j = 0; j < C; j++)\n+\t\t\t\tdata_.push_back(static_cast<T>(i == j));\n+\t};\n+\n+\tMatrix(const std::vector<T> &data)\n+\t{\n+\t\tASSERT(data_.size() == R * C);\n+\n+\t\tfor (const T &x : data)\n+\t\t\tdata_.push_back(x);\n+\t}\n+\n+\t~Matrix(){};\n+\n+\tint readYaml(const libcamera::YamlObject &yaml)\n+\t{\n+\t\tif (yaml.size() != R * C) {\n+\t\t\tLOG(Matrix, Error)\n+\t\t\t\t<< \"Wrong number of values in matrix: expected \"\n+\t\t\t\t<< R * C << \", got \" << yaml.size();\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tunsigned int i = 0;\n+\t\tfor (const auto &x : yaml.asList()) {\n+\t\t\tauto value = x.get<T>();\n+\t\t\tif (!value) {\n+\t\t\t\tLOG(Matrix, Error) << \"Failed to read matrix value\";\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\n+\t\t\tdata_[i++] = *value;\n+\t\t}\n+\n+\t\treturn 0;\n+\t}\n+\n+\tconst std::string toString() const\n+\t{\n+\t\tstd::stringstream ss;\n+\t\tss << \"Matrix { \";\n+\t\tfor (unsigned int i = 0; i < R; i++) {\n+\t\t\tss << \"[ \";\n+\t\t\tfor (unsigned int j = 0; j < C; j++) {\n+\t\t\t\tss << get(i, j);\n+\t\t\t\tss << ((j + 1 < C) ? \", \" : \" \");\n+\t\t\t}\n+\t\t\tss << ((i + 1 < R) ? \"], \" : \"]\");\n+\t\t}\n+\t\tss << \" }\";\n+\n+\t\treturn ss.str();\n+\t}\n+\n+\tconst T &get(unsigned int i, unsigned int j) const { return data_.at(i * C + j); }\n+\tvoid set(unsigned int i, unsigned int j, T value) { data_[i * C + j] = value; }\n+\n+private:\n+\tstd::vector<T> data_;\n+};\n+\n+template<typename T, unsigned int R, unsigned int C,\n+\t std::enable_if_t<std::is_arithmetic_v<T>> * = nullptr>\n+Matrix<T, R, C> operator*(T d, const Matrix<T, R, C> &m)\n+{\n+\tMatrix<T, R, C> result;\n+\n+\tfor (unsigned int i = 0; i < R; i++)\n+\t\tfor (unsigned int j = 0; j < C; j++)\n+\t\t\tresult.set(i, j, d * m.get(i, j));\n+\n+\treturn result;\n+}\n+\n+template<typename T,\n+\t unsigned int R1, unsigned int C1,\n+\t unsigned int R2, unsigned int C2,\n+\t std::enable_if_t<std::is_arithmetic_v<T> && C1 == R2> * = nullptr>\n+Matrix<T, R1, C2> operator*(const Matrix<T, R1, C1> &m1, const Matrix<T, R2, C2> &m2)\n+{\n+\tMatrix<T, R1, C2> result;\n+\n+\tfor (unsigned int i = 0; i < R1; i++) {\n+\t\tfor (unsigned int j = 0; j < C2; j++) {\n+\t\t\tT sum = 0;\n+\n+\t\t\tfor (unsigned int k = 0; k < C1; k++)\n+\t\t\t\tsum += m1.get(i, k) * m2.get(k, j);\n+\n+\t\t\tresult.set(i, j, sum);\n+\t\t}\n+\t}\n+\n+\treturn result;\n+}\n+\n+template<typename T, unsigned int R, unsigned int C,\n+\t std::enable_if_t<std::is_arithmetic_v<T>> * = nullptr>\n+Matrix<T, R, C> operator+(const Matrix<T, R, C> &m1, const Matrix<T, R, C> &m2)\n+{\n+\tMatrix<T, R, C> result;\n+\n+\tfor (unsigned int i = 0; i < R; i++)\n+\t\tfor (unsigned int j = 0; j < C; j++)\n+\t\t\tresult.set(i, j, m1.get(i, j) + m2.get(i, j));\n+\n+\treturn result;\n+}\n+\n+} /* namespace ipa */\n+\n+} /* namespace libcamera */\ndiff --git a/src/ipa/libipa/meson.build b/src/ipa/libipa/meson.build\nindex 1b3faf8d..1e34355f 100644\n--- a/src/ipa/libipa/meson.build\n+++ b/src/ipa/libipa/meson.build\n@@ -7,6 +7,7 @@ libipa_headers = files([\n 'exposure_mode_helper.h',\n 'fc_queue.h',\n 'histogram.h',\n+ 'matrix.h',\n 'module.h',\n 'pwl.h',\n ])\n@@ -18,6 +19,7 @@ libipa_sources = files([\n 'exposure_mode_helper.cpp',\n 'fc_queue.cpp',\n 'histogram.cpp',\n+ 'matrix.cpp',\n 'module.cpp',\n 'pwl.cpp'\n ])\n", "prefixes": [ "v2", "1/3" ] }