From 2b1a8f48f3a414e565cefb809f3e6a7c6aa5f8a7 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 6 Oct 2021 10:26:00 +0300 Subject: Split V4L2 code into separate libs Create v4l2++ library and pyv4l2, which are independent from the rest of the kms++. Signed-off-by: Tomi Valkeinen --- py/pykms/meson.build | 1 - py/pykms/pykms.cpp | 3 --- py/pykms/pyvid.cpp | 46 ---------------------------------------------- 3 files changed, 50 deletions(-) delete mode 100644 py/pykms/pyvid.cpp (limited to 'py/pykms') diff --git a/py/pykms/meson.build b/py/pykms/meson.build index e030ce8..db5cbd0 100644 --- a/py/pykms/meson.build +++ b/py/pykms/meson.build @@ -19,7 +19,6 @@ pykms_sources = files([ if get_option('utils') pykms_sources += files([ 'pykmsutil.cpp', - 'pyvid.cpp', ]) endif diff --git a/py/pykms/pykms.cpp b/py/pykms/pykms.cpp index b91a1a9..e9266a4 100644 --- a/py/pykms/pykms.cpp +++ b/py/pykms/pykms.cpp @@ -9,7 +9,6 @@ using namespace std; void init_pykmstest(py::module& m); void init_pykmsbase(py::module& m); -void init_pyvid(py::module& m); #if HAS_LIBDRM_OMAP void init_pykmsomap(py::module& m); @@ -21,8 +20,6 @@ PYBIND11_MODULE(pykms, m) init_pykmstest(m); - init_pyvid(m); - #if HAS_LIBDRM_OMAP init_pykmsomap(m); #endif diff --git a/py/pykms/pyvid.cpp b/py/pykms/pyvid.cpp deleted file mode 100644 index 54ad480..0000000 --- a/py/pykms/pyvid.cpp +++ /dev/null @@ -1,46 +0,0 @@ -#include -#include -#include -#include -#include - -namespace py = pybind11; - -using namespace kms; -using namespace std; - -void init_pyvid(py::module& m) -{ - py::class_(m, "VideoDevice") - .def(py::init()) - .def_property_readonly("fd", &VideoDevice::fd) - .def_property_readonly("has_capture", &VideoDevice::has_capture) - .def_property_readonly("has_output", &VideoDevice::has_output) - .def_property_readonly("has_m2m", &VideoDevice::has_m2m) - .def_property_readonly("capture_streamer", &VideoDevice::get_capture_streamer) - .def_property_readonly("output_streamer", &VideoDevice::get_output_streamer) - .def_property_readonly("discrete_frame_sizes", &VideoDevice::get_discrete_frame_sizes) - .def_property_readonly("frame_sizes", &VideoDevice::get_frame_sizes) - .def("get_capture_devices", &VideoDevice::get_capture_devices); - - py::class_(m, "VideoStreamer") - .def_property_readonly("fd", &VideoStreamer::fd) - .def_property_readonly("ports", &VideoStreamer::get_ports) - .def("set_port", &VideoStreamer::set_port) - .def_property_readonly("formats", &VideoStreamer::get_formats) - .def("set_format", &VideoStreamer::set_format) - .def("get_selection", [](VideoStreamer* self) { - uint32_t left, top, width, height; - self->get_selection(left, top, width, height); - return make_tuple(left, top, width, height); - }) - .def("set_selection", [](VideoStreamer* self, uint32_t left, uint32_t top, uint32_t width, uint32_t height) { - self->set_selection(left, top, width, height); - return make_tuple(left, top, width, height); - }) - .def("set_queue_size", &VideoStreamer::set_queue_size) - .def("queue", &VideoStreamer::queue) - .def("dequeue", &VideoStreamer::dequeue) - .def("stream_on", &VideoStreamer::stream_on) - .def("stream_off", &VideoStreamer::stream_off); -} -- cgit v1.2.3