[libcamera-devel] [PATCH v2 12/13] py: add geometry classes
Kieran Bingham
kieran.bingham at ideasonboard.com
Tue May 17 19:15:31 CEST 2022
Quoting Laurent Pinchart (2022-05-17 17:18:20)
> Hi Tomi,
>
> Thank you for the patch.
>
> On Tue, May 17, 2022 at 05:33:24PM +0300, Tomi Valkeinen wrote:
> > Add libcamera's geometry classes to the Python bindings.
> >
> > Note that this commit only adds the classes, but they are not used
> > anywhere yet.
> >
> > Signed-off-by: Tomi Valkeinen <tomi.valkeinen at ideasonboard.com>
>
> Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
All looks quite clean to me.
Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
>
> > ---
> > src/py/libcamera/meson.build | 1 +
> > src/py/libcamera/pygeometry.cpp | 119 ++++++++++++++++++++++++++++++++
> > src/py/libcamera/pymain.cpp | 2 +
> > 3 files changed, 122 insertions(+)
> > create mode 100644 src/py/libcamera/pygeometry.cpp
> >
> > diff --git a/src/py/libcamera/meson.build b/src/py/libcamera/meson.build
> > index 32e74504..0bef52c7 100644
> > --- a/src/py/libcamera/meson.build
> > +++ b/src/py/libcamera/meson.build
> > @@ -14,6 +14,7 @@ pybind11_dep = pybind11_proj.get_variable('pybind11_dep')
> >
> > pycamera_sources = files([
> > 'pyenums.cpp',
> > + 'pygeometry.cpp',
> > 'pymain.cpp',
> > ])
> >
> > diff --git a/src/py/libcamera/pygeometry.cpp b/src/py/libcamera/pygeometry.cpp
> > new file mode 100644
> > index 00000000..d77de144
> > --- /dev/null
> > +++ b/src/py/libcamera/pygeometry.cpp
> > @@ -0,0 +1,119 @@
> > +/* SPDX-License-Identifier: LGPL-2.1-or-later */
> > +/*
> > + * Copyright (C) 2022, Tomi Valkeinen <tomi.valkeinen at ideasonboard.com>
> > + *
> > + * Python bindings - Geometry classes
> > + */
> > +
> > +#include <array>
> > +
> > +#include <libcamera/geometry.h>
> > +#include <libcamera/libcamera.h>
> > +
> > +#include <pybind11/operators.h>
> > +#include <pybind11/smart_holder.h>
> > +#include <pybind11/stl.h>
> > +
> > +namespace py = pybind11;
> > +
> > +using namespace libcamera;
> > +
> > +void init_pygeometry(py::module &m)
> > +{
> > + auto pyPoint = py::class_<Point>(m, "Point");
> > + auto pySize = py::class_<Size>(m, "Size");
> > + auto pySizeRange = py::class_<SizeRange>(m, "SizeRange");
> > + auto pyRectangle = py::class_<Rectangle>(m, "Rectangle");
> > +
> > + pyPoint
> > + .def(py::init<>())
> > + .def(py::init<int, int>())
> > + .def_readwrite("x", &Point::x)
> > + .def_readwrite("y", &Point::y)
> > + .def(py::self == py::self)
> > + .def(-py::self)
> > + .def("__str__", &Point::toString)
> > + .def("__repr__", [](const Point &self) {
> > + return py::str("libcamera.Point({}, {})")
> > + .format(self.x, self.y);
> > + });
> > +
> > + pySize
> > + .def(py::init<>())
> > + .def(py::init<unsigned int, unsigned int>())
> > + .def_readwrite("width", &Size::width)
> > + .def_readwrite("height", &Size::height)
> > + .def_property_readonly("is_null", &Size::isNull)
> > + .def("align_down_to", &Size::alignDownTo)
> > + .def("align_up_to", &Size::alignUpTo)
> > + .def("bound_to", &Size::boundTo)
> > + .def("expand_to", &Size::expandTo)
> > + .def("grow_by", &Size::growBy)
> > + .def("shrink_by", &Size::shrinkBy)
> > + .def("aligned_up_to", &Size::alignedUpTo)
> > + .def("aligned_up_to", &Size::alignedUpTo)
> > + .def("bounded_to", &Size::boundedTo)
> > + .def("expanded_to", &Size::expandedTo)
> > + .def("grown_by", &Size::grownBy)
> > + .def("shrunk_by", &Size::shrunkBy)
> > + .def("bounded_to_aspect_ratio", &Size::boundedToAspectRatio)
> > + .def("expanded_to_aspect_ratio", &Size::expandedToAspectRatio)
> > + .def("centered_to", &Size::centeredTo)
> > + .def(py::self == py::self)
> > + .def(py::self < py::self)
> > + .def(py::self <= py::self)
> > + .def(py::self * float())
> > + .def(py::self / float())
> > + .def(py::self *= float())
> > + .def(py::self /= float())
> > + .def("__str__", &Size::toString)
> > + .def("__repr__", [](const Size &self) {
> > + return py::str("libcamera.Size({}, {})")
> > + .format(self.width, self.height);
> > + });
> > +
> > + pySizeRange
> > + .def(py::init<>())
> > + .def(py::init<Size>())
> > + .def(py::init<Size, Size>())
> > + .def(py::init<Size, Size, unsigned int, unsigned int>())
> > + .def_readwrite("min", &SizeRange::min)
> > + .def_readwrite("max", &SizeRange::max)
> > + .def_readwrite("hStep", &SizeRange::hStep)
> > + .def_readwrite("vStep", &SizeRange::vStep)
> > + .def("contains", &SizeRange::contains)
> > + .def(py::self == py::self)
> > + .def("__str__", &SizeRange::toString)
> > + .def("__repr__", [](const SizeRange &self) {
> > + return py::str("libcamera.SizeRange(({}, {}), ({}, {}), {}, {})")
> > + .format(self.min.width, self.min.height,
> > + self.max.width, self.max.height,
> > + self.hStep, self.vStep);
> > + });
> > +
> > + pyRectangle
> > + .def(py::init<>())
> > + .def(py::init<int, int, Size>())
> > + .def(py::init<int, int, unsigned int, unsigned int>())
> > + .def(py::init<Size>())
> > + .def_readwrite("x", &Rectangle::x)
> > + .def_readwrite("y", &Rectangle::y)
> > + .def_readwrite("width", &Rectangle::width)
> > + .def_readwrite("height", &Rectangle::height)
> > + .def_property_readonly("is_null", &Rectangle::isNull)
> > + .def_property_readonly("center", &Rectangle::center)
> > + .def_property_readonly("size", &Rectangle::size)
> > + .def_property_readonly("topLeft", &Rectangle::topLeft)
> > + .def("scale_by", &Rectangle::scaleBy)
> > + .def("translate_by", &Rectangle::translateBy)
> > + .def("bounded_to", &Rectangle::boundedTo)
> > + .def("enclosed_in", &Rectangle::enclosedIn)
> > + .def("scaled_by", &Rectangle::scaledBy)
> > + .def("translated_by", &Rectangle::translatedBy)
> > + .def(py::self == py::self)
> > + .def("__str__", &Rectangle::toString)
> > + .def("__repr__", [](const Rectangle &self) {
> > + return py::str("libcamera.Rectangle({}, {}, {}, {})")
> > + .format(self.x, self.y, self.width, self.height);
> > + });
> > +}
> > diff --git a/src/py/libcamera/pymain.cpp b/src/py/libcamera/pymain.cpp
> > index 97b05903..96333ebc 100644
> > --- a/src/py/libcamera/pymain.cpp
> > +++ b/src/py/libcamera/pymain.cpp
> > @@ -137,11 +137,13 @@ static void handleRequestCompleted(Request *req)
> >
> > void init_pyenums(py::module &m);
> > void init_pyenums_generated(py::module &m);
> > +void init_pygeometry(py::module &m);
> >
> > PYBIND11_MODULE(_libcamera, m)
> > {
> > init_pyenums(m);
> > init_pyenums_generated(m);
> > + init_pygeometry(m);
> >
> > /* Forward declarations */
> >
>
> --
> Regards,
>
> Laurent Pinchart
More information about the libcamera-devel
mailing list