[libcamera-devel] [PATCH] py: Support controls that use an array of Rectangles
David Plowman
david.plowman at raspberrypi.com
Thu Dec 8 14:44:14 CET 2022
The Python bindings will now accept, or return, a list or tuple of
libcamera.Rectangle objects for such controls.
This had previously been omitted, but now we have, for example, the
AfWindows control which requires this feature.
Signed-off-by: David Plowman <david.plowman at raspberrypi.com>
---
src/py/libcamera/py_helpers.cpp | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/py/libcamera/py_helpers.cpp b/src/py/libcamera/py_helpers.cpp
index f685e606..79891ab6 100644
--- a/src/py/libcamera/py_helpers.cpp
+++ b/src/py/libcamera/py_helpers.cpp
@@ -46,10 +46,8 @@ py::object controlValueToPy(const ControlValue &cv)
return valueOrTuple<float>(cv);
case ControlTypeString:
return py::cast(cv.get<std::string>());
- case ControlTypeRectangle: {
- const Rectangle *v = reinterpret_cast<const Rectangle *>(cv.data().data());
- return py::cast(v);
- }
+ case ControlTypeRectangle:
+ return valueOrTuple<Rectangle>(cv);
case ControlTypeSize: {
const Size *v = reinterpret_cast<const Size *>(cv.data().data());
return py::cast(v);
@@ -88,7 +86,7 @@ ControlValue pyToControlValue(const py::object &ob, ControlType type)
case ControlTypeString:
return ControlValue(ob.cast<std::string>());
case ControlTypeRectangle:
- return ControlValue(ob.cast<Rectangle>());
+ return controlValueMaybeArray<Rectangle>(ob);
case ControlTypeSize:
return ControlValue(ob.cast<Size>());
case ControlTypeNone:
--
2.30.2
More information about the libcamera-devel
mailing list