{"id":16341,"url":"https://patchwork.libcamera.org/api/patches/16341/?format=json","web_url":"https://patchwork.libcamera.org/patch/16341/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20220623144736.78537-4-tomi.valkeinen@ideasonboard.com>","date":"2022-06-23T14:47:32","name":"[libcamera-devel,RFC,v1,3/7] py: Move ControlValue helpers to py_helpers.cpp","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"32542cdcce2a17907129edf2ff79b0be7df13d6f","submitter":{"id":109,"url":"https://patchwork.libcamera.org/api/people/109/?format=json","name":"Tomi Valkeinen","email":"tomi.valkeinen@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16341/mbox/","series":[{"id":3213,"url":"https://patchwork.libcamera.org/api/series/3213/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3213","date":"2022-06-23T14:47:29","name":"Python bindings event handling","version":1,"mbox":"https://patchwork.libcamera.org/series/3213/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16341/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16341/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 47A0BBD808\n\tfor ;\n\tThu, 23 Jun 2022 14:48:05 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id F16726564D;\n\tThu, 23 Jun 2022 16:48:04 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E1D5565638\n\tfor ;\n\tThu, 23 Jun 2022 16:47:58 +0200 (CEST)","from deskari.lan (91-158-154-79.elisa-laajakaista.fi\n\t[91.158.154.79])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 57A6BDD;\n\tThu, 23 Jun 2022 16:47:58 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1655995685;\n\tbh=Kes4IEJUdm5RCMrrRequIPqPOCTHyYS5zdzrNvorcGM=;\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=mZPDhAkxFssrfDtjJLrLnOJo0W7rEhmuAo/QdN61p0Bx5Su0/009w03j5Vkb9Op5o\n\tqnok+4DvePDH719M27Izmk43ur60iGoEsfdGxc4RbwE9QguJz67a7TbGj4+zLL9Jv1\n\to9KJ5eYIF/D7jRTdyrgT8/93IH0HX0IUFV1qrpvGJIDW4sHMvrzAZQeYGQQBrcJq7b\n\tyJR0yUMiwjyTFDEhASeZUHPHRtg+bcvsf6aqadhifHdpFi/dX9cf09gRYc3TUzFovm\n\txh9YZT5hIPI5FULboM5dDkb2B90wFlFndA9dh6s14rQmsiluPXUCPktwm6HkD89/Fc\n\tDpxL1OHwBL7Sg==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1655995678;\n\tbh=Kes4IEJUdm5RCMrrRequIPqPOCTHyYS5zdzrNvorcGM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=ijfQTBm3ZkMi9q02goNQtIKOERp8jPJy3cs2Qyy6cB1tWAGViafDJ3fqc+1lnCmai\n\tLGlLwFmWoWbjrI1ht8OQI/VDI4UlBELtGo4GrfUYPry5JPfmr63BQfA9II2354vk4c\n\tt+kLf+bLH99p6mFkdjBPywuZBnfTMR6s98GmdzUk="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"ijfQTBm3\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org,\n\tDavid Plowman ,\n\tKieran Bingham ,\n\tLaurent Pinchart ,\n\tJacopo Mondi ","Date":"Thu, 23 Jun 2022 17:47:32 +0300","Message-Id":"<20220623144736.78537-4-tomi.valkeinen@ideasonboard.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20220623144736.78537-1-tomi.valkeinen@ideasonboard.com>","References":"<20220623144736.78537-1-tomi.valkeinen@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [RFC v1 3/7] py: Move ControlValue helpers to\n\tpy_helpers.cpp","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":"Clean up the py_main.cpp a bit by moving the ControlValue helpers to a\nseparate file.\n\nSigned-off-by: Tomi Valkeinen \n---\n src/py/libcamera/meson.build | 1 +\n src/py/libcamera/py_helpers.cpp | 98 +++++++++++++++++++++++++++++++++\n src/py/libcamera/py_helpers.h | 13 +++++\n src/py/libcamera/py_main.cpp | 83 +---------------------------\n 4 files changed, 114 insertions(+), 81 deletions(-)\n create mode 100644 src/py/libcamera/py_helpers.cpp\n create mode 100644 src/py/libcamera/py_helpers.h","diff":"diff --git a/src/py/libcamera/meson.build b/src/py/libcamera/meson.build\nindex eb884538..04578bac 100644\n--- a/src/py/libcamera/meson.build\n+++ b/src/py/libcamera/meson.build\n@@ -15,6 +15,7 @@ pybind11_dep = pybind11_proj.get_variable('pybind11_dep')\n pycamera_sources = files([\n 'py_enums.cpp',\n 'py_geometry.cpp',\n+ 'py_helpers.cpp',\n 'py_main.cpp',\n ])\n \ndiff --git a/src/py/libcamera/py_helpers.cpp b/src/py/libcamera/py_helpers.cpp\nnew file mode 100644\nindex 00000000..d0a8b5c4\n--- /dev/null\n+++ b/src/py/libcamera/py_helpers.cpp\n@@ -0,0 +1,98 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2022, Tomi Valkeinen \n+ */\n+\n+#include \"py_helpers.h\"\n+\n+#include \n+\n+#include \n+#include \n+#include \n+#include \n+\n+namespace py = pybind11;\n+\n+using namespace libcamera;\n+\n+template\n+static py::object valueOrTuple(const ControlValue &cv)\n+{\n+\tif (cv.isArray()) {\n+\t\tconst T *v = reinterpret_cast(cv.data().data());\n+\t\tauto t = py::tuple(cv.numElements());\n+\n+\t\tfor (size_t i = 0; i < cv.numElements(); ++i)\n+\t\t\tt[i] = v[i];\n+\n+\t\treturn std::move(t);\n+\t}\n+\n+\treturn py::cast(cv.get());\n+}\n+\n+py::object controlValueToPy(const ControlValue &cv)\n+{\n+\tswitch (cv.type()) {\n+\tcase ControlTypeBool:\n+\t\treturn valueOrTuple(cv);\n+\tcase ControlTypeByte:\n+\t\treturn valueOrTuple(cv);\n+\tcase ControlTypeInteger32:\n+\t\treturn valueOrTuple(cv);\n+\tcase ControlTypeInteger64:\n+\t\treturn valueOrTuple(cv);\n+\tcase ControlTypeFloat:\n+\t\treturn valueOrTuple(cv);\n+\tcase ControlTypeString:\n+\t\treturn py::cast(cv.get());\n+\tcase ControlTypeRectangle: {\n+\t\tconst Rectangle *v = reinterpret_cast(cv.data().data());\n+\t\treturn py::cast(v);\n+\t}\n+\tcase ControlTypeSize: {\n+\t\tconst Size *v = reinterpret_cast(cv.data().data());\n+\t\treturn py::cast(v);\n+\t}\n+\tcase ControlTypeNone:\n+\tdefault:\n+\t\tthrow std::runtime_error(\"Unsupported ControlValue type\");\n+\t}\n+}\n+\n+template\n+static ControlValue controlValueMaybeArray(const py::object &ob)\n+{\n+\tif (py::isinstance(ob) || py::isinstance(ob)) {\n+\t\tstd::vector vec = ob.cast>();\n+\t\treturn ControlValue(Span(vec));\n+\t}\n+\n+\treturn ControlValue(ob.cast());\n+}\n+\n+ControlValue pyToControlValue(const py::object &ob, ControlType type)\n+{\n+\tswitch (type) {\n+\tcase ControlTypeBool:\n+\t\treturn ControlValue(ob.cast());\n+\tcase ControlTypeByte:\n+\t\treturn controlValueMaybeArray(ob);\n+\tcase ControlTypeInteger32:\n+\t\treturn controlValueMaybeArray(ob);\n+\tcase ControlTypeInteger64:\n+\t\treturn controlValueMaybeArray(ob);\n+\tcase ControlTypeFloat:\n+\t\treturn controlValueMaybeArray(ob);\n+\tcase ControlTypeString:\n+\t\treturn ControlValue(ob.cast());\n+\tcase ControlTypeRectangle:\n+\t\treturn ControlValue(ob.cast());\n+\tcase ControlTypeSize:\n+\t\treturn ControlValue(ob.cast());\n+\tcase ControlTypeNone:\n+\tdefault:\n+\t\tthrow std::runtime_error(\"Control type not implemented\");\n+\t}\n+}\ndiff --git a/src/py/libcamera/py_helpers.h b/src/py/libcamera/py_helpers.h\nnew file mode 100644\nindex 00000000..cd31e2cc\n--- /dev/null\n+++ b/src/py/libcamera/py_helpers.h\n@@ -0,0 +1,13 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2022, Tomi Valkeinen \n+ */\n+\n+#pragma once\n+\n+#include \n+\n+#include \n+\n+pybind11::object controlValueToPy(const libcamera::ControlValue &cv);\n+libcamera::ControlValue pyToControlValue(const pybind11::object &ob, libcamera::ControlType type);\ndiff --git a/src/py/libcamera/py_main.cpp b/src/py/libcamera/py_main.cpp\nindex 17b17f60..5a423ece 100644\n--- a/src/py/libcamera/py_main.cpp\n+++ b/src/py/libcamera/py_main.cpp\n@@ -21,93 +21,14 @@\n #include \n #include \n \n+#include \"py_helpers.h\"\n+\n namespace py = pybind11;\n \n using namespace libcamera;\n \n LOG_DEFINE_CATEGORY(Python)\n \n-template\n-static py::object valueOrTuple(const ControlValue &cv)\n-{\n-\tif (cv.isArray()) {\n-\t\tconst T *v = reinterpret_cast(cv.data().data());\n-\t\tauto t = py::tuple(cv.numElements());\n-\n-\t\tfor (size_t i = 0; i < cv.numElements(); ++i)\n-\t\t\tt[i] = v[i];\n-\n-\t\treturn std::move(t);\n-\t}\n-\n-\treturn py::cast(cv.get());\n-}\n-\n-static py::object controlValueToPy(const ControlValue &cv)\n-{\n-\tswitch (cv.type()) {\n-\tcase ControlTypeBool:\n-\t\treturn valueOrTuple(cv);\n-\tcase ControlTypeByte:\n-\t\treturn valueOrTuple(cv);\n-\tcase ControlTypeInteger32:\n-\t\treturn valueOrTuple(cv);\n-\tcase ControlTypeInteger64:\n-\t\treturn valueOrTuple(cv);\n-\tcase ControlTypeFloat:\n-\t\treturn valueOrTuple(cv);\n-\tcase ControlTypeString:\n-\t\treturn py::cast(cv.get());\n-\tcase ControlTypeRectangle: {\n-\t\tconst Rectangle *v = reinterpret_cast(cv.data().data());\n-\t\treturn py::cast(v);\n-\t}\n-\tcase ControlTypeSize: {\n-\t\tconst Size *v = reinterpret_cast(cv.data().data());\n-\t\treturn py::cast(v);\n-\t}\n-\tcase ControlTypeNone:\n-\tdefault:\n-\t\tthrow std::runtime_error(\"Unsupported ControlValue type\");\n-\t}\n-}\n-\n-template\n-static ControlValue controlValueMaybeArray(const py::object &ob)\n-{\n-\tif (py::isinstance(ob) || py::isinstance(ob)) {\n-\t\tstd::vector vec = ob.cast>();\n-\t\treturn ControlValue(Span(vec));\n-\t}\n-\n-\treturn ControlValue(ob.cast());\n-}\n-\n-static ControlValue pyToControlValue(const py::object &ob, ControlType type)\n-{\n-\tswitch (type) {\n-\tcase ControlTypeBool:\n-\t\treturn ControlValue(ob.cast());\n-\tcase ControlTypeByte:\n-\t\treturn controlValueMaybeArray(ob);\n-\tcase ControlTypeInteger32:\n-\t\treturn controlValueMaybeArray(ob);\n-\tcase ControlTypeInteger64:\n-\t\treturn controlValueMaybeArray(ob);\n-\tcase ControlTypeFloat:\n-\t\treturn controlValueMaybeArray(ob);\n-\tcase ControlTypeString:\n-\t\treturn ControlValue(ob.cast());\n-\tcase ControlTypeRectangle:\n-\t\treturn ControlValue(ob.cast());\n-\tcase ControlTypeSize:\n-\t\treturn ControlValue(ob.cast());\n-\tcase ControlTypeNone:\n-\tdefault:\n-\t\tthrow std::runtime_error(\"Control type not implemented\");\n-\t}\n-}\n-\n static std::weak_ptr gCameraManager;\n static int gEventfd;\n static std::mutex gReqlistMutex;\n","prefixes":["libcamera-devel","RFC","v1","3/7"]}