Patch Detail
Show a patch.
GET /api/1.1/patches/16495/?format=api
{ "id": 16495, "url": "https://patchwork.libcamera.org/api/1.1/patches/16495/?format=api", "web_url": "https://patchwork.libcamera.org/patch/16495/", "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": "<20220701084521.31831-4-tomi.valkeinen@ideasonboard.com>", "date": "2022-07-01T08:45:07", "name": "[libcamera-devel,v3,03/17] py: Move ControlValue helpers to py_helpers.cpp", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "cec57be068e6087ccd0a70990988b78496cd0de5", "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/16495/mbox/", "series": [ { "id": 3241, "url": "https://patchwork.libcamera.org/api/1.1/series/3241/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3241", "date": "2022-07-01T08:45:04", "name": "Python bindings event handling", "version": 3, "mbox": "https://patchwork.libcamera.org/series/3241/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/16495/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/16495/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 DE638BD808\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 1 Jul 2022 08:45:48 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DE4636565D;\n\tFri, 1 Jul 2022 10:45:44 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 262636564E\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 1 Jul 2022 10:45:42 +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 9892725C;\n\tFri, 1 Jul 2022 10:45:41 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1656665144;\n\tbh=Pa5/wJaKKF4mEpNi/1FHR/wV42PbNXVxJ/ZFRVOKfAQ=;\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=QcNPgoLyQslVvmyDSiPJuzpb2+VptCBSDyjHlaOMQQEtyIYvojgIetJ+sniCDA11Z\n\tKjTgGtLVn8a6JpI9xUzExXC+Ekj9Ty7rasUBiKtSP7RdBnYoA3kX1dbSDLMypAy91Z\n\t5GBWfoZVmonC+RQ1eagyBNyeQU+OMy2G86Hjkt3d0OrKD4dKFIVXR499RQSoaa/8K3\n\tg3jF68JEikp4i9+Epl/D/bH6nZLPdvCEaZ4I2f7D1X/Ba2x0HBxWWCT9TZMJsHTkRO\n\tbKUxEIc3pmTtOMI3cTyuBDdF8NFN+Qp1v6hvMqelszTYH8/YIFC7h3Eg16dbbgTV50\n\tBNykKUc97bIRQ==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1656665141;\n\tbh=Pa5/wJaKKF4mEpNi/1FHR/wV42PbNXVxJ/ZFRVOKfAQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=es+9PqDV+yeP5LR1FoZMw+7ep+4Dqkk3HVgDhV7cqWZ85reFhd+h2Wv6+V3CimB9T\n\tI80DVxwQX4K0qsdRXcXo6Wty8szQXa5TVg6znvaYBFZjsV7R8KJu0Eemn6QFKnJoeu\n\t2X5JgIYIpWh0s4vvPD0+AWqS3zAQCXdLkuEWXSaQ=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"es+9PqDV\"; 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, 1 Jul 2022 11:45:07 +0300", "Message-Id": "<20220701084521.31831-4-tomi.valkeinen@ideasonboard.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20220701084521.31831-1-tomi.valkeinen@ideasonboard.com>", "References": "<20220701084521.31831-1-tomi.valkeinen@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 03/17] 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": "<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": "Clean up the py_main.cpp a bit by moving the ControlValue helpers to a\nseparate file.\n\nSigned-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/py/libcamera/meson.build | 1 +\n src/py/libcamera/py_helpers.cpp | 97 +++++++++++++++++++++++++++++++++\n src/py/libcamera/py_helpers.h | 13 +++++\n src/py/libcamera/py_main.cpp | 83 +---------------------------\n 4 files changed, 113 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..45aecce9\n--- /dev/null\n+++ b/src/py/libcamera/py_helpers.cpp\n@@ -0,0 +1,97 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2022, Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>\n+ */\n+\n+#include \"py_helpers.h\"\n+\n+#include <libcamera/libcamera.h>\n+\n+#include <pybind11/functional.h>\n+#include <pybind11/stl.h>\n+#include <pybind11/stl_bind.h>\n+\n+namespace py = pybind11;\n+\n+using namespace libcamera;\n+\n+template<typename T>\n+static py::object valueOrTuple(const ControlValue &cv)\n+{\n+\tif (cv.isArray()) {\n+\t\tconst T *v = reinterpret_cast<const T *>(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<T>());\n+}\n+\n+py::object controlValueToPy(const ControlValue &cv)\n+{\n+\tswitch (cv.type()) {\n+\tcase ControlTypeBool:\n+\t\treturn valueOrTuple<bool>(cv);\n+\tcase ControlTypeByte:\n+\t\treturn valueOrTuple<uint8_t>(cv);\n+\tcase ControlTypeInteger32:\n+\t\treturn valueOrTuple<int32_t>(cv);\n+\tcase ControlTypeInteger64:\n+\t\treturn valueOrTuple<int64_t>(cv);\n+\tcase ControlTypeFloat:\n+\t\treturn valueOrTuple<float>(cv);\n+\tcase ControlTypeString:\n+\t\treturn py::cast(cv.get<std::string>());\n+\tcase ControlTypeRectangle: {\n+\t\tconst Rectangle *v = reinterpret_cast<const Rectangle *>(cv.data().data());\n+\t\treturn py::cast(v);\n+\t}\n+\tcase ControlTypeSize: {\n+\t\tconst Size *v = reinterpret_cast<const Size *>(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<typename T>\n+static ControlValue controlValueMaybeArray(const py::object &ob)\n+{\n+\tif (py::isinstance<py::list>(ob) || py::isinstance<py::tuple>(ob)) {\n+\t\tstd::vector<T> vec = ob.cast<std::vector<T>>();\n+\t\treturn ControlValue(Span<const T>(vec));\n+\t}\n+\n+\treturn ControlValue(ob.cast<T>());\n+}\n+\n+ControlValue pyToControlValue(const py::object &ob, ControlType type)\n+{\n+\tswitch (type) {\n+\tcase ControlTypeBool:\n+\t\treturn ControlValue(ob.cast<bool>());\n+\tcase ControlTypeByte:\n+\t\treturn controlValueMaybeArray<uint8_t>(ob);\n+\tcase ControlTypeInteger32:\n+\t\treturn controlValueMaybeArray<int32_t>(ob);\n+\tcase ControlTypeInteger64:\n+\t\treturn controlValueMaybeArray<int64_t>(ob);\n+\tcase ControlTypeFloat:\n+\t\treturn controlValueMaybeArray<float>(ob);\n+\tcase ControlTypeString:\n+\t\treturn ControlValue(ob.cast<std::string>());\n+\tcase ControlTypeRectangle:\n+\t\treturn ControlValue(ob.cast<Rectangle>());\n+\tcase ControlTypeSize:\n+\t\treturn ControlValue(ob.cast<Size>());\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 <tomi.valkeinen@ideasonboard.com>\n+ */\n+\n+#pragma once\n+\n+#include <libcamera/libcamera.h>\n+\n+#include <pybind11/smart_holder.h>\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 4b698f77..e652837f 100644\n--- a/src/py/libcamera/py_main.cpp\n+++ b/src/py/libcamera/py_main.cpp\n@@ -21,6 +21,8 @@\n #include <pybind11/stl.h>\n #include <pybind11/stl_bind.h>\n \n+#include \"py_helpers.h\"\n+\n namespace py = pybind11;\n \n using namespace libcamera;\n@@ -31,87 +33,6 @@ LOG_DEFINE_CATEGORY(Python)\n \n }\n \n-template<typename T>\n-static py::object valueOrTuple(const ControlValue &cv)\n-{\n-\tif (cv.isArray()) {\n-\t\tconst T *v = reinterpret_cast<const T *>(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<T>());\n-}\n-\n-static py::object controlValueToPy(const ControlValue &cv)\n-{\n-\tswitch (cv.type()) {\n-\tcase ControlTypeBool:\n-\t\treturn valueOrTuple<bool>(cv);\n-\tcase ControlTypeByte:\n-\t\treturn valueOrTuple<uint8_t>(cv);\n-\tcase ControlTypeInteger32:\n-\t\treturn valueOrTuple<int32_t>(cv);\n-\tcase ControlTypeInteger64:\n-\t\treturn valueOrTuple<int64_t>(cv);\n-\tcase ControlTypeFloat:\n-\t\treturn valueOrTuple<float>(cv);\n-\tcase ControlTypeString:\n-\t\treturn py::cast(cv.get<std::string>());\n-\tcase ControlTypeRectangle: {\n-\t\tconst Rectangle *v = reinterpret_cast<const Rectangle *>(cv.data().data());\n-\t\treturn py::cast(v);\n-\t}\n-\tcase ControlTypeSize: {\n-\t\tconst Size *v = reinterpret_cast<const Size *>(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<typename T>\n-static ControlValue controlValueMaybeArray(const py::object &ob)\n-{\n-\tif (py::isinstance<py::list>(ob) || py::isinstance<py::tuple>(ob)) {\n-\t\tstd::vector<T> vec = ob.cast<std::vector<T>>();\n-\t\treturn ControlValue(Span<const T>(vec));\n-\t}\n-\n-\treturn ControlValue(ob.cast<T>());\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<bool>());\n-\tcase ControlTypeByte:\n-\t\treturn controlValueMaybeArray<uint8_t>(ob);\n-\tcase ControlTypeInteger32:\n-\t\treturn controlValueMaybeArray<int32_t>(ob);\n-\tcase ControlTypeInteger64:\n-\t\treturn controlValueMaybeArray<int64_t>(ob);\n-\tcase ControlTypeFloat:\n-\t\treturn controlValueMaybeArray<float>(ob);\n-\tcase ControlTypeString:\n-\t\treturn ControlValue(ob.cast<std::string>());\n-\tcase ControlTypeRectangle:\n-\t\treturn ControlValue(ob.cast<Rectangle>());\n-\tcase ControlTypeSize:\n-\t\treturn ControlValue(ob.cast<Size>());\n-\tcase ControlTypeNone:\n-\tdefault:\n-\t\tthrow std::runtime_error(\"Control type not implemented\");\n-\t}\n-}\n-\n static std::weak_ptr<CameraManager> gCameraManager;\n static int gEventfd;\n static std::mutex gReqlistMutex;\n", "prefixes": [ "libcamera-devel", "v3", "03/17" ] }