Patch Detail
Show a patch.
GET /api/1.1/patches/15966/?format=api
{ "id": 15966, "url": "https://patchwork.libcamera.org/api/1.1/patches/15966/?format=api", "web_url": "https://patchwork.libcamera.org/patch/15966/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20220518131329.66994-18-tomi.valkeinen@ideasonboard.com>", "date": "2022-05-18T13:13:28", "name": "[libcamera-devel,v3,17/18] py: generate pixel formats list", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b8364ffa28d970f644b74ce05966560b3c11dd85", "submitter": { "id": 109, "url": "https://patchwork.libcamera.org/api/1.1/people/109/?format=api", "name": "Tomi Valkeinen", "email": "tomi.valkeinen@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/15966/mbox/", "series": [ { "id": 3122, "url": "https://patchwork.libcamera.org/api/1.1/series/3122/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3122", "date": "2022-05-18T13:13:11", "name": "Misc Python bindings patches", "version": 3, "mbox": "https://patchwork.libcamera.org/series/3122/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/15966/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/15966/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 6E9F0C326D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 18 May 2022 13:14:10 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0C31F65670;\n\tWed, 18 May 2022 15:14:10 +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 2EDB265679\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 18 May 2022 15:13:55 +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 937EB1AAA;\n\tWed, 18 May 2022 15:13:54 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1652879650;\n\tbh=POBN2UUasnTVP4s+8csr4u5zfcA7NuEJONAMXGjgQaU=;\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=nCTXyG4HdE1OfKahNCV6FaKD6oocFKEZNeEEx8xlSeeM5AX5W/qd3MS5ZPFG1LBYf\n\teBhffMq1V7xRg1gBhYtJR8jG9F5hCn3+LxReZgDiGrd+9pvLUJiX/LzaCaujTR3ASY\n\tJeNWKD6wevk5w0M60BwNLV9A/FadSxnWP1kDgtA+GmZEOJMaFJtg3rENKhGjJKM1Ko\n\tw5uxgwBPhfU78DXMzFUOo/sexr9aagR49JyxXEzNyZMJUm81/ixvxNEYJTYVB5OVLE\n\tdy84aWptlnc4w25x5uIeyz2LzwjEfm8Yf/I1FcHvNiMWYrv8J4HeLDXVPtP4kvfsc5\n\tO1MFJeH7IZNTw==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1652879634;\n\tbh=POBN2UUasnTVP4s+8csr4u5zfcA7NuEJONAMXGjgQaU=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=UmiaYJ529ybqxetpzjvKok3Y4qAlaZKBn3nknvqht/DZxq3NaCsoqSNHW37o5sp+E\n\t29HhYHYBIzWFEC6iqjKscP9//Sl3K8/PlcnQbQxil6eAxRx7OnifwqIiJrlC4lcOj+\n\tk/gmAWLmxFg1p1CtoiUq3mIIxzqX+RjFZhbynY9s=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"UmiaYJ52\"; 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": "Wed, 18 May 2022 16:13:28 +0300", "Message-Id": "<20220518131329.66994-18-tomi.valkeinen@ideasonboard.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20220518131329.66994-1-tomi.valkeinen@ideasonboard.com>", "References": "<20220518131329.66994-1-tomi.valkeinen@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 17/18] py: generate pixel formats list", "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": "Generate a list of pixel formats under \"libcamera.formats\".\n\nI'm not super happy about this solution, as the user can change the\nformats (libcamera.formats.XRGB8888 = None) and, for some reason,\npybind11-stubgen doesn't produce stubs for this.\n\nHowever, other than the two issues above, it works, and I haven't\nfigured out a better way.\n\nSigned-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>\n---\n src/py/libcamera/gen-py-formats.py | 56 ++++++++++++++++++++\n src/py/libcamera/meson.build | 12 +++++\n src/py/libcamera/py_formats_generated.cpp.in | 21 ++++++++\n src/py/libcamera/py_main.cpp | 3 ++\n 4 files changed, 92 insertions(+)\n create mode 100755 src/py/libcamera/gen-py-formats.py\n create mode 100644 src/py/libcamera/py_formats_generated.cpp.in", "diff": "diff --git a/src/py/libcamera/gen-py-formats.py b/src/py/libcamera/gen-py-formats.py\nnew file mode 100755\nindex 00000000..72565a25\n--- /dev/null\n+++ b/src/py/libcamera/gen-py-formats.py\n@@ -0,0 +1,56 @@\n+#!/usr/bin/env python3\n+# SPDX-License-Identifier: GPL-2.0-or-later\n+#\n+# Generate Python format definitions from YAML\n+\n+import argparse\n+import string\n+import sys\n+import yaml\n+\n+\n+def generate(formats):\n+ fmts = []\n+\n+ for format in formats:\n+ name, format = format.popitem()\n+ fmts.append(f'formats.attr(\"{name}\") = &libcamera::formats::{name};')\n+\n+ return {'formats': '\\n'.join(fmts)}\n+\n+\n+def fill_template(template, data):\n+ with open(template, encoding='utf-8') as f:\n+ template = f.read()\n+\n+ template = string.Template(template)\n+ return template.substitute(data)\n+\n+\n+def main(argv):\n+ parser = argparse.ArgumentParser()\n+ parser.add_argument('-o', dest='output', metavar='file', type=str,\n+ help='Output file name. Defaults to standard output if not specified.')\n+ parser.add_argument('input', type=str,\n+ help='Input file name.')\n+ parser.add_argument('template', type=str,\n+ help='Template file name.')\n+ args = parser.parse_args(argv[1:])\n+\n+ with open(args.input, encoding='utf-8') as f:\n+ formats = yaml.safe_load(f)['formats']\n+\n+ data = generate(formats)\n+ data = fill_template(args.template, data)\n+\n+ if args.output:\n+ with open(args.output, 'w', encoding='utf-8') as f:\n+ f.write(data)\n+ else:\n+ sys.stdout.write(data)\n+\n+ return 0\n+\n+\n+if __name__ == '__main__':\n+ sys.exit(main(sys.argv))\ndiff --git a/src/py/libcamera/meson.build b/src/py/libcamera/meson.build\nindex a3388c63..0a7b65f3 100644\n--- a/src/py/libcamera/meson.build\n+++ b/src/py/libcamera/meson.build\n@@ -30,6 +30,18 @@ pycamera_sources += custom_target('py_gen_controls',\n output : ['py_control_enums_generated.cpp'],\n command : [gen_py_control_enums, '-o', '@OUTPUT@', '@INPUT@'])\n \n+gen_py_formats_input_files = files([\n+ '../../libcamera/formats.yaml',\n+ 'py_formats_generated.cpp.in',\n+])\n+\n+gen_py_formats = files('gen-py-formats.py')\n+\n+pycamera_sources += custom_target('py_gen_formats',\n+ input : gen_py_formats_input_files,\n+ output : ['py_formats_generated.cpp'],\n+ command : [gen_py_formats, '-o', '@OUTPUT@', '@INPUT@'])\n+\n pycamera_deps = [\n libcamera_public,\n py3_dep,\ndiff --git a/src/py/libcamera/py_formats_generated.cpp.in b/src/py/libcamera/py_formats_generated.cpp.in\nnew file mode 100644\nindex 00000000..1100c024\n--- /dev/null\n+++ b/src/py/libcamera/py_formats_generated.cpp.in\n@@ -0,0 +1,21 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2022, Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>\n+ *\n+ * Python bindings - Auto-generated formats\n+ *\n+ * This file is auto-generated. Do not edit.\n+ */\n+\n+#include <libcamera/formats.h>\n+\n+#include <pybind11/smart_holder.h>\n+\n+namespace py = pybind11;\n+\n+void init_py_formats_generated(py::module& m)\n+{\n+auto formats = m.def_submodule(\"formats\");\n+\n+${formats}\n+}\ndiff --git a/src/py/libcamera/py_main.cpp b/src/py/libcamera/py_main.cpp\nindex 1d941160..e7066841 100644\n--- a/src/py/libcamera/py_main.cpp\n+++ b/src/py/libcamera/py_main.cpp\n@@ -132,6 +132,7 @@ static void handleRequestCompleted(Request *req)\n \n void init_py_enums(py::module &m);\n void init_py_control_enums_generated(py::module &m);\n+void init_py_formats_generated(py::module &m);\n void init_py_geometry(py::module &m);\n \n PYBIND11_MODULE(_libcamera, m)\n@@ -171,6 +172,8 @@ PYBIND11_MODULE(_libcamera, m)\n \tauto pyColorSpaceRange = py::enum_<ColorSpace::Range>(pyColorSpace, \"Range\");\n \tauto pyPixelFormat = py::class_<PixelFormat>(m, \"PixelFormat\");\n \n+\tinit_py_formats_generated(m);\n+\n \t/* Global functions */\n \tm.def(\"log_set_level\", &logSetLevel);\n \n", "prefixes": [ "libcamera-devel", "v3", "17/18" ] }