{"id":22032,"url":"https://patchwork.libcamera.org/api/patches/22032/?format=json","web_url":"https://patchwork.libcamera.org/patch/22032/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20241120142807.2093301-2-stefan.klug@ideasonboard.com>","date":"2024-11-20T14:27:48","name":"[v3,1/9] ipa: rpi: Rename Matrix to Matrix3x3","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"fba42e7522797bd235de44ce4d34a299d7978f83","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":{"id":17,"url":"https://patchwork.libcamera.org/api/users/17/?format=json","username":"epaul","first_name":"Paul","last_name":"Elder","email":"paul.elder@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/22032/mbox/","series":[{"id":4809,"url":"https://patchwork.libcamera.org/api/series/4809/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4809","date":"2024-11-20T14:27:47","name":"Move Matrix class from libipa to libcamera","version":3,"mbox":"https://patchwork.libcamera.org/series/4809/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22032/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22032/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 5D28EC32F8\n\tfor ;\n\tWed, 20 Nov 2024 14:28:19 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id F2C4065F54;\n\tWed, 20 Nov 2024 15:28:18 +0100 (CET)","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 8A68D65F5D\n\tfor ;\n\tWed, 20 Nov 2024 15:28:16 +0100 (CET)","from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:bbd:82cc:f3f3:e12e])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 46EA755A;\n\tWed, 20 Nov 2024 15:27:58 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"Y/kXjDdv\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1732112878;\n\tbh=JvEJqHgV6z9onV0xiUtVoyTE4vTvVwX4RRPlM7hask4=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Y/kXjDdvL8zcE7/zhLs8/iOdTMUWKITfsDz1HqHeWHbg6uSbkuTCjOe2cAXEF09DV\n\tmOcCInQ4wWNzfexzXVR4O6NNVAYJUrDHHxV6Q1YaJ6F9AOJbdH8FivZhEqyBUp/fVJ\n\taNm3hl1xMb6RVS7SYliooVV4rLGbFlU1JDlwH5T8=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ,\n\tLaurent Pinchart ","Subject":"[PATCH v3 1/9] ipa: rpi: Rename Matrix to Matrix3x3","Date":"Wed, 20 Nov 2024 15:27:48 +0100","Message-ID":"<20241120142807.2093301-2-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20241120142807.2093301-1-stefan.klug@ideasonboard.com>","References":"<20241120142807.2093301-1-stefan.klug@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":"The upcoming patches will introduce a Matrix class into\nlibcamera/internal. That name clashes with the Matrix class from the\nRaspberryPi ccm implementation. Rename the rpi version to Matrix3x3 to\nprevent the name clash. Matrix3x3 will be replaced by the generic\nimplementation later.\n\nSigned-off-by: Stefan Klug \nReviewed-by: Laurent Pinchart \n\n---\nChanges in v3:\n- Collect tags\n- Fixed typo in commit msg\n---\n src/ipa/rpi/controller/rpi/ccm.cpp | 18 +++++++++---------\n src/ipa/rpi/controller/rpi/ccm.h | 20 ++++++++++----------\n 2 files changed, 19 insertions(+), 19 deletions(-)","diff":"diff --git a/src/ipa/rpi/controller/rpi/ccm.cpp b/src/ipa/rpi/controller/rpi/ccm.cpp\nindex aefa580c9a4b..7f63f3fdb702 100644\n--- a/src/ipa/rpi/controller/rpi/ccm.cpp\n+++ b/src/ipa/rpi/controller/rpi/ccm.cpp\n@@ -29,17 +29,17 @@ LOG_DEFINE_CATEGORY(RPiCcm)\n \n #define NAME \"rpi.ccm\"\n \n-Matrix::Matrix()\n+Matrix3x3::Matrix3x3()\n {\n \tmemset(m, 0, sizeof(m));\n }\n-Matrix::Matrix(double m0, double m1, double m2, double m3, double m4, double m5,\n+Matrix3x3::Matrix3x3(double m0, double m1, double m2, double m3, double m4, double m5,\n \t double m6, double m7, double m8)\n {\n \tm[0][0] = m0, m[0][1] = m1, m[0][2] = m2, m[1][0] = m3, m[1][1] = m4,\n \tm[1][2] = m5, m[2][0] = m6, m[2][1] = m7, m[2][2] = m8;\n }\n-int Matrix::read(const libcamera::YamlObject ¶ms)\n+int Matrix3x3::read(const libcamera::YamlObject ¶ms)\n {\n \tdouble *ptr = (double *)m;\n \n@@ -125,7 +125,7 @@ bool getLocked(Metadata *metadata, std::string const &tag, T &value)\n \treturn true;\n }\n \n-Matrix calculateCcm(std::vector const &ccms, double ct)\n+Matrix3x3 calculateCcm(std::vector const &ccms, double ct)\n {\n \tif (ct <= ccms.front().ct)\n \t\treturn ccms.front().ccm;\n@@ -141,13 +141,13 @@ Matrix calculateCcm(std::vector const &ccms, double ct)\n \t}\n }\n \n-Matrix applySaturation(Matrix const &ccm, double saturation)\n+Matrix3x3 applySaturation(Matrix3x3 const &ccm, double saturation)\n {\n-\tMatrix RGB2Y(0.299, 0.587, 0.114, -0.169, -0.331, 0.500, 0.500, -0.419,\n+\tMatrix3x3 RGB2Y(0.299, 0.587, 0.114, -0.169, -0.331, 0.500, 0.500, -0.419,\n \t\t -0.081);\n-\tMatrix Y2RGB(1.000, 0.000, 1.402, 1.000, -0.345, -0.714, 1.000, 1.771,\n+\tMatrix3x3 Y2RGB(1.000, 0.000, 1.402, 1.000, -0.345, -0.714, 1.000, 1.771,\n \t\t 0.000);\n-\tMatrix S(1, 0, 0, 0, saturation, 0, 0, 0, saturation);\n+\tMatrix3x3 S(1, 0, 0, 0, saturation, 0, 0, 0, saturation);\n \treturn Y2RGB * S * RGB2Y * ccm;\n }\n \n@@ -170,7 +170,7 @@ void Ccm::prepare(Metadata *imageMetadata)\n \t\tLOG(RPiCcm, Warning) << \"no colour temperature found\";\n \tif (!luxOk)\n \t\tLOG(RPiCcm, Warning) << \"no lux value found\";\n-\tMatrix ccm = calculateCcm(config_.ccms, awb.temperatureK);\n+\tMatrix3x3 ccm = calculateCcm(config_.ccms, awb.temperatureK);\n \tdouble saturation = saturation_;\n \tstruct CcmStatus ccmStatus;\n \tccmStatus.saturation = saturation;\ndiff --git a/src/ipa/rpi/controller/rpi/ccm.h b/src/ipa/rpi/controller/rpi/ccm.h\nindex 4e5b33fefa4e..8e7f9616c2ab 100644\n--- a/src/ipa/rpi/controller/rpi/ccm.h\n+++ b/src/ipa/rpi/controller/rpi/ccm.h\n@@ -16,22 +16,22 @@ namespace RPiController {\n \n /* Algorithm to calculate colour matrix. Should be placed after AWB. */\n \n-struct Matrix {\n-\tMatrix(double m0, double m1, double m2, double m3, double m4, double m5,\n+struct Matrix3x3 {\n+\tMatrix3x3(double m0, double m1, double m2, double m3, double m4, double m5,\n \t double m6, double m7, double m8);\n-\tMatrix();\n+\tMatrix3x3();\n \tdouble m[3][3];\n \tint read(const libcamera::YamlObject ¶ms);\n };\n-static inline Matrix operator*(double d, Matrix const &m)\n+static inline Matrix3x3 operator*(double d, Matrix3x3 const &m)\n {\n-\treturn Matrix(m.m[0][0] * d, m.m[0][1] * d, m.m[0][2] * d,\n+\treturn Matrix3x3(m.m[0][0] * d, m.m[0][1] * d, m.m[0][2] * d,\n \t\t m.m[1][0] * d, m.m[1][1] * d, m.m[1][2] * d,\n \t\t m.m[2][0] * d, m.m[2][1] * d, m.m[2][2] * d);\n }\n-static inline Matrix operator*(Matrix const &m1, Matrix const &m2)\n+static inline Matrix3x3 operator*(Matrix3x3 const &m1, Matrix3x3 const &m2)\n {\n-\tMatrix m;\n+\tMatrix3x3 m;\n \tfor (int i = 0; i < 3; i++)\n \t\tfor (int j = 0; j < 3; j++)\n \t\t\tm.m[i][j] = m1.m[i][0] * m2.m[0][j] +\n@@ -39,9 +39,9 @@ static inline Matrix operator*(Matrix const &m1, Matrix const &m2)\n \t\t\t\t m1.m[i][2] * m2.m[2][j];\n \treturn m;\n }\n-static inline Matrix operator+(Matrix const &m1, Matrix const &m2)\n+static inline Matrix3x3 operator+(Matrix3x3 const &m1, Matrix3x3 const &m2)\n {\n-\tMatrix m;\n+\tMatrix3x3 m;\n \tfor (int i = 0; i < 3; i++)\n \t\tfor (int j = 0; j < 3; j++)\n \t\t\tm.m[i][j] = m1.m[i][j] + m2.m[i][j];\n@@ -50,7 +50,7 @@ static inline Matrix operator+(Matrix const &m1, Matrix const &m2)\n \n struct CtCcm {\n \tdouble ct;\n-\tMatrix ccm;\n+\tMatrix3x3 ccm;\n };\n \n struct CcmConfig {\n","prefixes":["v3","1/9"]}