{"id":22037,"url":"https://patchwork.libcamera.org/api/1.1/patches/22037/?format=json","web_url":"https://patchwork.libcamera.org/patch/22037/","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":"<20241120142807.2093301-7-stefan.klug@ideasonboard.com>","date":"2024-11-20T14:27:53","name":"[v3,6/9] ipa: rpi: ccm: Replace local matrix implementation with the one from libcamera","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"bc04535d7a9d30b6c1ac0302b38a5a33e9914a33","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/1.1/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/users/17/?format=json","username":"epaul","first_name":"Paul","last_name":"Elder","email":"paul.elder@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/22037/mbox/","series":[{"id":4809,"url":"https://patchwork.libcamera.org/api/1.1/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/22037/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22037/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 20051C330C\n\tfor ;\n\tWed, 20 Nov 2024 14:28:34 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AF90265F75;\n\tWed, 20 Nov 2024 15:28:33 +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 EAB4A65F64\n\tfor ;\n\tWed, 20 Nov 2024 15:28:28 +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 C131D75A;\n\tWed, 20 Nov 2024 15:28:10 +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=\"G3FeR7lV\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1732112890;\n\tbh=diTts7IBj3aer3sivmN+Zae7t14LNmJMyazAivBc/PY=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=G3FeR7lVw1no5OooInHDt+X/xUilOtFnyTJQOfEpVgLhy00YUOIInQ8CHzvfwqe+2\n\tkGyzFapuR32iGUEINQM3rp8XPV8Antaq8mgjCrts/jYfKTVTO3l1hGQ2Ff4DGL31ze\n\tuGKrdrUVCIDjyQUurWS1O4eVkVzG6Ds/IK7EhzkE=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ,\n\tLaurent Pinchart ","Subject":"[PATCH v3 6/9] ipa: rpi: ccm: Replace local matrix implementation\n\twith the one from libcamera","Date":"Wed, 20 Nov 2024 15:27:53 +0100","Message-ID":"<20241120142807.2093301-7-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 RaspberryPi IPA contains a private Matrix3x3 class inside the ccm\nalgorithm. Replace it with the Matrix class available in\nlibcamera/internal.\n\nWhile at it, mark the matrices RGB2Y and Y2RGB as static const.\n\nSigned-off-by: Stefan Klug \nReviewed-by: Laurent Pinchart \n\n---\nChanges in v3:\n- Collected tags\n- Reformatted matrices\n- Tested on actual device\n---\n src/ipa/rpi/controller/rpi/ccm.cpp | 59 ++++++++++--------------------\n src/ipa/rpi/controller/rpi/ccm.h | 35 +-----------------\n 2 files changed, 22 insertions(+), 72 deletions(-)","diff":"diff --git a/src/ipa/rpi/controller/rpi/ccm.cpp b/src/ipa/rpi/controller/rpi/ccm.cpp\nindex 7f63f3fdb702..8607f1521b5a 100644\n--- a/src/ipa/rpi/controller/rpi/ccm.cpp\n+++ b/src/ipa/rpi/controller/rpi/ccm.cpp\n@@ -29,34 +29,7 @@ LOG_DEFINE_CATEGORY(RPiCcm)\n \n #define NAME \"rpi.ccm\"\n \n-Matrix3x3::Matrix3x3()\n-{\n-\tmemset(m, 0, sizeof(m));\n-}\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 Matrix3x3::read(const libcamera::YamlObject ¶ms)\n-{\n-\tdouble *ptr = (double *)m;\n-\n-\tif (params.size() != 9) {\n-\t\tLOG(RPiCcm, Error) << \"Wrong number of values in CCM\";\n-\t\treturn -EINVAL;\n-\t}\n-\n-\tfor (const auto ¶m : params.asList()) {\n-\t\tauto value = param.get();\n-\t\tif (!value)\n-\t\t\treturn -EINVAL;\n-\t\t*ptr++ = *value;\n-\t}\n-\n-\treturn 0;\n-}\n+using Matrix3x3 = Matrix;\n \n Ccm::Ccm(Controller *controller)\n \t: CcmAlgorithm(controller), saturation_(1.0) {}\n@@ -68,8 +41,6 @@ char const *Ccm::name() const\n \n int Ccm::read(const libcamera::YamlObject ¶ms)\n {\n-\tint ret;\n-\n \tif (params.contains(\"saturation\")) {\n \t\tconfig_.saturation = params[\"saturation\"].get(ipa::Pwl{});\n \t\tif (config_.saturation.empty())\n@@ -83,9 +54,12 @@ int Ccm::read(const libcamera::YamlObject ¶ms)\n \n \t\tCtCcm ctCcm;\n \t\tctCcm.ct = *value;\n-\t\tret = ctCcm.ccm.read(p[\"ccm\"]);\n-\t\tif (ret)\n-\t\t\treturn ret;\n+\n+\t\tauto ccm = p[\"ccm\"].get();\n+\t\tif (!ccm)\n+\t\t\treturn -EINVAL;\n+\n+\t\tctCcm.ccm = *ccm;\n \n \t\tif (!config_.ccms.empty() && ctCcm.ct <= config_.ccms.back().ct) {\n \t\t\tLOG(RPiCcm, Error)\n@@ -143,11 +117,18 @@ Matrix3x3 calculateCcm(std::vector const &ccms, double ct)\n \n Matrix3x3 applySaturation(Matrix3x3 const &ccm, double saturation)\n {\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-\tMatrix3x3 Y2RGB(1.000, 0.000, 1.402, 1.000, -0.345, -0.714, 1.000, 1.771,\n-\t\t 0.000);\n-\tMatrix3x3 S(1, 0, 0, 0, saturation, 0, 0, 0, saturation);\n+\tstatic const Matrix3x3 RGB2Y({ 0.299, 0.587, 0.114,\n+\t\t\t\t -0.169, -0.331, 0.500,\n+\t\t\t\t 0.500, -0.419, -0.081 });\n+\n+\tstatic const Matrix3x3 Y2RGB({ 1.000, 0.000, 1.402,\n+\t\t\t\t 1.000, -0.345, -0.714,\n+\t\t\t\t 1.000, 1.771, 0.000 });\n+\n+\tMatrix3x3 S({ 1, 0, 0,\n+\t\t 0, saturation, 0,\n+\t\t 0, 0, saturation });\n+\n \treturn Y2RGB * S * RGB2Y * ccm;\n }\n \n@@ -181,7 +162,7 @@ void Ccm::prepare(Metadata *imageMetadata)\n \tfor (int j = 0; j < 3; j++)\n \t\tfor (int i = 0; i < 3; i++)\n \t\t\tccmStatus.matrix[j * 3 + i] =\n-\t\t\t\tstd::max(-8.0, std::min(7.9999, ccm.m[j][i]));\n+\t\t\t\tstd::max(-8.0, std::min(7.9999, ccm[j][i]));\n \tLOG(RPiCcm, Debug)\n \t\t<< \"colour temperature \" << awb.temperatureK << \"K\";\n \tLOG(RPiCcm, Debug)\ndiff --git a/src/ipa/rpi/controller/rpi/ccm.h b/src/ipa/rpi/controller/rpi/ccm.h\nindex 8e7f9616c2ab..c05dbb17a264 100644\n--- a/src/ipa/rpi/controller/rpi/ccm.h\n+++ b/src/ipa/rpi/controller/rpi/ccm.h\n@@ -8,6 +8,7 @@\n \n #include \n \n+#include \"libcamera/internal/matrix.h\"\n #include \n \n #include \"../ccm_algorithm.h\"\n@@ -16,41 +17,9 @@ namespace RPiController {\n \n /* Algorithm to calculate colour matrix. Should be placed after AWB. */\n \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-\tMatrix3x3();\n-\tdouble m[3][3];\n-\tint read(const libcamera::YamlObject ¶ms);\n-};\n-static inline Matrix3x3 operator*(double d, Matrix3x3 const &m)\n-{\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 Matrix3x3 operator*(Matrix3x3 const &m1, Matrix3x3 const &m2)\n-{\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-\t\t\t\t m1.m[i][1] * m2.m[1][j] +\n-\t\t\t\t m1.m[i][2] * m2.m[2][j];\n-\treturn m;\n-}\n-static inline Matrix3x3 operator+(Matrix3x3 const &m1, Matrix3x3 const &m2)\n-{\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-\treturn m;\n-}\n-\n struct CtCcm {\n \tdouble ct;\n-\tMatrix3x3 ccm;\n+\tlibcamera::Matrix ccm;\n };\n \n struct CcmConfig {\n","prefixes":["v3","6/9"]}