{"id":16021,"url":"https://patchwork.libcamera.org/api/1.1/patches/16021/?format=json","web_url":"https://patchwork.libcamera.org/patch/16021/","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":"<20220524114610.41848-16-tomi.valkeinen@ideasonboard.com>","date":"2022-05-24T11:46:06","name":"[libcamera-devel,v2,15/19] py: Re-implement controls geneneration","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"3dd9652ceac62ec5e3360aaf69382550d7fcce31","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/16021/mbox/","series":[{"id":3134,"url":"https://patchwork.libcamera.org/api/1.1/series/3134/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3134","date":"2022-05-24T11:45:51","name":"More misc Python patches","version":2,"mbox":"https://patchwork.libcamera.org/series/3134/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16021/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16021/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 5859EBD161\n\tfor ;\n\tTue, 24 May 2022 11:46:53 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EE19F65692;\n\tTue, 24 May 2022 13:46:52 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E6DB66566C\n\tfor ;\n\tTue, 24 May 2022 13:46:37 +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 59E39A16;\n\tTue, 24 May 2022 13:46:37 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1653392813;\n\tbh=LCOgD3KxUFzPEi0mLP9cLyY2+pIhr+Mw2Ym96J/B/5c=;\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=I9cyeJ7xsECRmPcSgHAMtMa5rCBPl8VetQF0sMkm99D7w36L/jVm+fvlF9i0QbF3f\n\tUUQf5q8D1DGVuda39RoHj3q+dKfrjXviA6tEW11tidHRCDZ0TEEUqmCNF1MZLdDFEQ\n\t2B9Q1vEze0O3xqjYtXljl8rIwc8+3Waqd1EAi3+Z9WKljeOM1X8KQib4vcvU183T0D\n\t6YACMEiIjckSUzRtpX+8qZOwFUK38706ak7sd/pjX2768gEoyCnFIDRPdTTpbcxp7h\n\thgYQfoLBhHO0IrozPdNoHCpncrsqOWo/Ggv12NDIneU+1R5O3wxFhFRqzsQdSxJZhE\n\tTBQEwOSMwpe0g==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1653392797;\n\tbh=LCOgD3KxUFzPEi0mLP9cLyY2+pIhr+Mw2Ym96J/B/5c=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=KTqXJVuYJE3KKsnGAdtUgUmVnA299swiI0MgeAOPth9mXC8lUeLg0JcFyF3Y7ACUL\n\tAade9m69PtX0luwiu8n525oeST0VUemHhIXPtoQBK5KuI+aynSV5uwJa/I1ZoewQ+Z\n\tPFi/Y6+wdaYXsD59hzrO5SpUokcwDV9mVpG5zAn0="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"KTqXJVuY\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org,\n\tDavid Plowman ,\n\tKieran Bingham ,\n\tLaurent Pinchart ,\n\tJacopo Mondi ","Date":"Tue, 24 May 2022 14:46:06 +0300","Message-Id":"<20220524114610.41848-16-tomi.valkeinen@ideasonboard.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20220524114610.41848-1-tomi.valkeinen@ideasonboard.com>","References":"<20220524114610.41848-1-tomi.valkeinen@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 15/19] py: Re-implement controls\n\tgeneneration","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","From":"Tomi Valkeinen via libcamera-devel\n\t","Reply-To":"Tomi Valkeinen ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The Python bindings controls generation was not very good. It only\ncovered the enums and they were in the main namespace.\n\nThis adds the controls somewhat similarly to the C++ side. We will have\ne.g.:\n\nlibcamera.controls.Brightness\nlibcamera.controls.AeMeteringModeEnum.CentreWeighted\n\nSigned-off-by: Tomi Valkeinen \n---\n ...py-control-enums.py => gen-py-controls.py} | 20 +++++++++++--------\n src/py/libcamera/meson.build | 16 +++++++++------\n ...ed.cpp.in => py_controls_generated.cpp.in} | 17 +++++++++++++---\n src/py/libcamera/py_main.cpp | 4 ++--\n 4 files changed, 38 insertions(+), 19 deletions(-)\n rename src/py/libcamera/{gen-py-control-enums.py => gen-py-controls.py} (85%)\n rename src/py/libcamera/{py_control_enums_generated.cpp.in => py_controls_generated.cpp.in} (50%)","diff":"diff --git a/src/py/libcamera/gen-py-control-enums.py b/src/py/libcamera/gen-py-controls.py\nsimilarity index 85%\nrename from src/py/libcamera/gen-py-control-enums.py\nrename to src/py/libcamera/gen-py-controls.py\nindex 6b2b5362..e3e1e178 100755\n--- a/src/py/libcamera/gen-py-control-enums.py\n+++ b/src/py/libcamera/gen-py-controls.py\n@@ -1,7 +1,7 @@\n #!/usr/bin/env python3\n # SPDX-License-Identifier: GPL-2.0-or-later\n #\n-# Generate Python bindings enums for controls from YAML\n+# Generate Python bindings controls from YAML\n \n import argparse\n import string\n@@ -27,18 +27,22 @@ def generate_py(controls):\n for ctrl in controls:\n name, ctrl = ctrl.popitem()\n \n- enum = ctrl.get('enum')\n- if not enum:\n- continue\n-\n if ctrl.get('draft'):\n ns = 'libcamera::controls::draft::'\n+ container = \"draft\"\n else:\n ns = 'libcamera::controls::'\n+ container = \"controls\"\n \n cpp_enum = name + 'Enum'\n \n- out += '\\tpy::enum_<{}{}>(m, \\\"{}\\\")\\n'.format(ns, cpp_enum, name)\n+ out += f'\\t{container}.def_readonly_static(\"{name}\", static_cast(&{ns}{name}));\\n\\n'\n+\n+ enum = ctrl.get('enum')\n+ if not enum:\n+ continue\n+\n+ out += '\\tpy::enum_<{}{}>({}, \\\"{}\\\")\\n'.format(ns, cpp_enum, container, cpp_enum)\n \n if name == 'LensShadingMapMode':\n prefix = 'LensShadingMapMode'\n@@ -54,9 +58,9 @@ def generate_py(controls):\n \n out += '\\t\\t.value(\\\"{}\\\", {}{})\\n'.format(py_enum, ns, cpp_enum)\n \n- out += '\\t;\\n'\n+ out += '\\t;\\n\\n'\n \n- return {'enums': out}\n+ return {'controls': out}\n \n \n def fill_template(template, data):\ndiff --git a/src/py/libcamera/meson.build b/src/py/libcamera/meson.build\nindex b705ac1f..e8010846 100644\n--- a/src/py/libcamera/meson.build\n+++ b/src/py/libcamera/meson.build\n@@ -18,17 +18,21 @@ pycamera_sources = files([\n 'py_main.cpp',\n ])\n \n-gen_py_control_enums_input_files = files([\n+# Generate controls\n+\n+gen_py_controls_input_files = files([\n '../../libcamera/control_ids.yaml',\n- 'py_control_enums_generated.cpp.in',\n+ 'py_controls_generated.cpp.in',\n ])\n \n-gen_py_control_enums = files('gen-py-control-enums.py')\n+gen_py_controls = files('gen-py-controls.py')\n \n pycamera_sources += custom_target('py_gen_controls',\n- input : gen_py_control_enums_input_files,\n- output : ['py_control_enums_generated.cpp'],\n- command : [gen_py_control_enums, '-o', '@OUTPUT@', '@INPUT@'])\n+ input : gen_py_controls_input_files,\n+ output : ['py_controls_generated.cpp'],\n+ command : [gen_py_controls, '-o', '@OUTPUT@', '@INPUT@'])\n+\n+# Generate formats\n \n gen_py_formats_input_files = files([\n '../../libcamera/formats.yaml',\ndiff --git a/src/py/libcamera/py_control_enums_generated.cpp.in b/src/py/libcamera/py_controls_generated.cpp.in\nsimilarity index 50%\nrename from src/py/libcamera/py_control_enums_generated.cpp.in\nrename to src/py/libcamera/py_controls_generated.cpp.in\nindex ed81fbe7..cb8442ba 100644\n--- a/src/py/libcamera/py_control_enums_generated.cpp.in\n+++ b/src/py/libcamera/py_controls_generated.cpp.in\n@@ -2,7 +2,7 @@\n /*\n * Copyright (C) 2022, Tomi Valkeinen \n *\n- * Python bindings - Auto-generated control enums\n+ * Python bindings - Auto-generated controls\n *\n * This file is auto-generated. Do not edit.\n */\n@@ -13,7 +13,18 @@\n \n namespace py = pybind11;\n \n-void init_py_control_enums_generated(py::module& m)\n+class PyControls\n {\n-${enums}\n+};\n+\n+class PyDraftControls\n+{\n+};\n+\n+void init_py_controls_generated(py::module& m)\n+{\n+\tauto controls = py::class_(m, \"controls\");\n+\tauto draft = py::class_(controls, \"draft\");\n+\n+${controls}\n }\ndiff --git a/src/py/libcamera/py_main.cpp b/src/py/libcamera/py_main.cpp\nindex 5d389942..33ecc1cd 100644\n--- a/src/py/libcamera/py_main.cpp\n+++ b/src/py/libcamera/py_main.cpp\n@@ -131,14 +131,14 @@ static void handleRequestCompleted(Request *req)\n }\n \n void init_py_enums(py::module &m);\n-void init_py_control_enums_generated(py::module &m);\n+void init_py_controls_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 {\n \tinit_py_enums(m);\n-\tinit_py_control_enums_generated(m);\n+\tinit_py_controls_generated(m);\n \tinit_py_geometry(m);\n \n \t/* Forward declarations */\n","prefixes":["libcamera-devel","v2","15/19"]}