{"id":16095,"url":"https://patchwork.libcamera.org/api/1.1/patches/16095/?format=json","web_url":"https://patchwork.libcamera.org/patch/16095/","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":"<20220527144447.94891-23-tomi.valkeinen@ideasonboard.com>","date":"2022-05-27T14:44:39","name":"[libcamera-devel,v3,22/30] py: Add FrameMetadataPlane","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"0b908cf41360e0a0def9b615f9fb13b99770963d","submitter":{"id":109,"url":"https://patchwork.libcamera.org/api/1.1/people/109/?format=json","name":"Tomi Valkeinen","email":"tomi.valkeinen@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16095/mbox/","series":[{"id":3146,"url":"https://patchwork.libcamera.org/api/1.1/series/3146/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3146","date":"2022-05-27T14:44:17","name":"More misc Python patches","version":3,"mbox":"https://patchwork.libcamera.org/series/3146/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16095/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16095/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 62E0BC3270\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 27 May 2022 14:45:37 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 05644656A4;\n\tFri, 27 May 2022 16:45:37 +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 DD3BD6563F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 27 May 2022 16:45:15 +0200 (CEST)","from deskari.lan (91-156-85-209.elisa-laajakaista.fi\n\t[91.156.85.209])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 53B9FD80;\n\tFri, 27 May 2022 16:45:15 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1653662737;\n\tbh=jsTL+qIbxJSn7ZLPLtfga4ld9MZGQRdgxhEB4elyv3o=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=iq6KTxvDzcGAV5SCNRkuzrVoNwFhM65ziulbuasr6fw4l+GT9s+McmmZVH1hcznmY\n\tL1M6QSm5s/9eovyWtPiTadjIfWcw3WrqBN7x6AS6wbdk1E+Cxf4DsQ4eFeRROvS+F7\n\twLMU9ktogumnDV1i1Ix43BPYE3e/sUvpHhOnFYOHz4Y/9fnvenuwrEDdJEoFir0EZB\n\tIBkijo/vFMtGgiPwOvHHm90mVyQBGtEb7d0APc8NBLk0E2n54/jeZk44lqRArk4IkH\n\tfS++lmgR1+gtYjPrB9kF9/2gR+RW10hVelswMwDBod/6YVT7wUA+PuDmni1NaSPhlE\n\tjdelWNsKMx03w==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1653662715;\n\tbh=jsTL+qIbxJSn7ZLPLtfga4ld9MZGQRdgxhEB4elyv3o=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=KevzTX83ebK2wqEdOUpFCDKUxx2zjW6fTpaZk6pcM5J8Lj0xdNwApXfvVTjb6B+o3\n\td8TxlLclD3Td0QrrrHRChvMNmDTSCs1VhNvdfx5q78Yns5Br9YkMyvoSKQ7HlO0eSX\n\t6328V9tVMXZh2hIW7hLll7cDddPlVGkmDmhQhWw8="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"KevzTX83\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org,\n\tDavid Plowman <david.plowman@raspberrypi.com>,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>,\n\tLaurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tJacopo Mondi <jacopo@jmondi.org>","Date":"Fri, 27 May 2022 17:44:39 +0300","Message-Id":"<20220527144447.94891-23-tomi.valkeinen@ideasonboard.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20220527144447.94891-1-tomi.valkeinen@ideasonboard.com>","References":"<20220527144447.94891-1-tomi.valkeinen@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 22/30] py: Add FrameMetadataPlane","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>","From":"Tomi Valkeinen via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>","Reply-To":"Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"Add FrameMetadataPlane class and adjust the methods and uses\naccordingly.\n\nSigned-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>\n---\n src/py/cam/cam.py            |  3 ++-\n src/py/libcamera/py_main.cpp | 13 ++++++++-----\n 2 files changed, 10 insertions(+), 6 deletions(-)","diff":"diff --git a/src/py/cam/cam.py b/src/py/cam/cam.py\nindex 677dd680..bf8529d9 100755\n--- a/src/py/cam/cam.py\n+++ b/src/py/cam/cam.py\n@@ -285,7 +285,8 @@ class CaptureState:\n             print('{:.6f} ({:.2f} fps) {}-{}: seq {}, bytes {}, CRCs {}'\n                   .format(ts / 1000000000, fps,\n                           ctx.id, stream_name,\n-                          meta.sequence, meta.bytesused,\n+                          meta.sequence,\n+                          '/'.join([str(p.bytes_used) for p in meta.planes]),\n                           crcs))\n \n             if ctx.opt_metadata:\ndiff --git a/src/py/libcamera/py_main.cpp b/src/py/libcamera/py_main.cpp\nindex 9e827845..52f70811 100644\n--- a/src/py/libcamera/py_main.cpp\n+++ b/src/py/libcamera/py_main.cpp\n@@ -163,6 +163,7 @@ PYBIND11_MODULE(_libcamera, m)\n \tauto pyRequestReuse = py::enum_<Request::ReuseFlag>(pyRequest, \"Reuse\");\n \tauto pyFrameMetadata = py::class_<FrameMetadata>(m, \"FrameMetadata\");\n \tauto pyFrameMetadataStatus = py::enum_<FrameMetadata::Status>(pyFrameMetadata, \"Status\");\n+\tauto pyFrameMetadataPlane = py::class_<FrameMetadata::Plane>(pyFrameMetadata, \"Plane\");\n \tauto pyTransform = py::class_<Transform>(m, \"Transform\");\n \tauto pyColorSpace = py::class_<ColorSpace>(m, \"ColorSpace\");\n \tauto pyColorSpacePrimaries = py::enum_<ColorSpace::Primaries>(pyColorSpace, \"Primaries\");\n@@ -512,11 +513,10 @@ PYBIND11_MODULE(_libcamera, m)\n \t\t.def_readonly(\"status\", &FrameMetadata::status)\n \t\t.def_readonly(\"sequence\", &FrameMetadata::sequence)\n \t\t.def_readonly(\"timestamp\", &FrameMetadata::timestamp)\n-\t\t/* \\todo Implement FrameMetadata::Plane properly */\n-\t\t.def_property_readonly(\"bytesused\", [](FrameMetadata &self) {\n-\t\t\tstd::vector<unsigned int> v;\n-\t\t\tv.resize(self.planes().size());\n-\t\t\ttransform(self.planes().begin(), self.planes().end(), v.begin(), [](const auto &p) { return p.bytesused; });\n+\t\t.def_property_readonly(\"planes\", [](const FrameMetadata &self) {\n+\t\t\t/* Convert from Span<> to std::vector<> */\n+\t\t\t/* Note: this creates a copy */\n+\t\t\tstd::vector<FrameMetadata::Plane> v(self.planes().begin(), self.planes().end());\n \t\t\treturn v;\n \t\t});\n \n@@ -525,6 +525,9 @@ PYBIND11_MODULE(_libcamera, m)\n \t\t.value(\"Error\", FrameMetadata::FrameError)\n \t\t.value(\"Cancelled\", FrameMetadata::FrameCancelled);\n \n+\tpyFrameMetadataPlane\n+\t\t.def_readwrite(\"bytes_used\", &FrameMetadata::Plane::bytesused);\n+\n \tpyTransform\n \t\t.def(py::init([](int rotation, bool hflip, bool vflip, bool transpose) {\n \t\t\tbool ok;\n","prefixes":["libcamera-devel","v3","22/30"]}