{"id":22720,"url":"https://patchwork.libcamera.org/api/1.1/patches/22720/?format=json","web_url":"https://patchwork.libcamera.org/patch/22720/","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":"<20250202232739.31548-1-laurent.pinchart@ideasonboard.com>","date":"2025-02-02T23:27:39","name":"[v2] libcamera: matrix: Add read-only accessor to internal data","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"67c62d4aeab09e9b459b7c2cf43c5690a6107822","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22720/mbox/","series":[{"id":4985,"url":"https://patchwork.libcamera.org/api/1.1/series/4985/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4985","date":"2025-02-02T23:27:39","name":"[v2] libcamera: matrix: Add read-only accessor to internal data","version":2,"mbox":"https://patchwork.libcamera.org/series/4985/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22720/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22720/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 46FB6C32DF\n\tfor ;\n\tSun, 2 Feb 2025 23:27:46 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7963961876;\n\tMon, 3 Feb 2025 00:27:45 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1485A61876\n\tfor ;\n\tMon, 3 Feb 2025 00:27:43 +0100 (CET)","from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D6E37227;\n\tMon, 3 Feb 2025 00:26:31 +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=\"W7myPJDp\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1738538792;\n\tbh=sBjcKNTQzb9qUvmdoEZ6AKEQtcR40/fKT0p/WtzHA3I=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=W7myPJDpKY0APMwexfjNO2oUm+Pb5G5RlcZqhGaxBFuuS3VhlKPhQgWROu592R6Zk\n\t/KNL/d05gB9iUsOCCz23eYDzrshVI4E/yuudoPmiZ/VD2ryOv87ri9gv8lC4amJrJh\n\tmnY31DJYO3V7CvdLlEpsTf/p2n9S8C4YNR1ztdVI=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ","Subject":"[PATCH v2] libcamera: matrix: Add read-only accessor to internal\n\tdata","Date":"Mon, 3 Feb 2025 01:27:39 +0200","Message-ID":"<20250202232739.31548-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.45.3","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 data() function to the Matrix class to access the internal data.\nThis is useful for code that needs to use the matrix contents as a\nlinear array, as shown by the RkISP1::Ccm::process() function that needs\nto copy the matrix data to a local variable. Simplify that function by\nusing the new accessor.\n\nSigned-off-by: Laurent Pinchart \nReviewed-by: Kieran Bingham \n---\nChanges since v1:\n\n- Expand function documentation\n---\n include/libcamera/internal/matrix.h | 2 ++\n src/ipa/rkisp1/algorithms/ccm.cpp | 7 +------\n src/libcamera/matrix.cpp | 11 +++++++++++\n 3 files changed, 14 insertions(+), 6 deletions(-)\n\n\nbase-commit: 9bc8b6a573a63b8c9f5588cdea6da5ae71abd138\n--\nRegards,\n\nLaurent Pinchart","diff":"diff --git a/include/libcamera/internal/matrix.h b/include/libcamera/internal/matrix.h\nindex 7a71028c473a..a055e6926c94 100644\n--- a/include/libcamera/internal/matrix.h\n+++ b/include/libcamera/internal/matrix.h\n@@ -66,6 +66,8 @@ public:\n \t\treturn out.str();\n \t}\n\n+\tSpan data() const { return data_; }\n+\n \tSpan operator[](size_t i) const\n \t{\n \t\treturn Span{ &data_.data()[i * Cols], Cols };\ndiff --git a/src/ipa/rkisp1/algorithms/ccm.cpp b/src/ipa/rkisp1/algorithms/ccm.cpp\nindex e2b5cf4d313e..eb8ca39e56a8 100644\n--- a/src/ipa/rkisp1/algorithms/ccm.cpp\n+++ b/src/ipa/rkisp1/algorithms/ccm.cpp\n@@ -120,12 +120,7 @@ void Ccm::process([[maybe_unused]] IPAContext &context,\n \t\t [[maybe_unused]] const rkisp1_stat_buffer *stats,\n \t\t ControlList &metadata)\n {\n-\tfloat m[9];\n-\tfor (unsigned int i = 0; i < 3; i++) {\n-\t\tfor (unsigned int j = 0; j < 3; j++)\n-\t\t\tm[i * 3 + j] = frameContext.ccm.ccm[i][j];\n-\t}\n-\tmetadata.set(controls::ColourCorrectionMatrix, m);\n+\tmetadata.set(controls::ColourCorrectionMatrix, frameContext.ccm.ccm.data());\n }\n\n REGISTER_IPA_ALGORITHM(Ccm, \"Ccm\")\ndiff --git a/src/libcamera/matrix.cpp b/src/libcamera/matrix.cpp\nindex 4d95a19bfbb9..e7e027225666 100644\n--- a/src/libcamera/matrix.cpp\n+++ b/src/libcamera/matrix.cpp\n@@ -52,6 +52,17 @@ LOG_DEFINE_CATEGORY(Matrix)\n * \\return A string describing the matrix\n */\n\n+/**\n+ * \\fn Matrix::data()\n+ * \\brief Access the matrix data as a linear array\n+ *\n+ * Access the contents of the matrix as a one-dimensional linear array of\n+ * values in row-major order. The size of the array is equal to the product of\n+ * the number of rows and columns of the matrix (Rows x Cols).\n+ *\n+ * \\return A span referencing the matrix data as a linear array\n+ */\n+\n /**\n * \\fn Span Matrix::operator[](size_t i) const\n * \\brief Index to a row in the matrix\n","prefixes":["v2"]}