diff --git a/modules/videoio/misc/python/pyopencv_videoio.hpp b/modules/videoio/misc/python/pyopencv_videoio.hpp index ab26e00c82..a4bc8e5494 100644 --- a/modules/videoio/misc/python/pyopencv_videoio.hpp +++ b/modules/videoio/misc/python/pyopencv_videoio.hpp @@ -141,4 +141,34 @@ bool pyopencv_to(PyObject* obj, Ptr& p, const ArgInfo&) return false; } +static PyObject* pycvVideoEnter(PyObject* self, PyObject* /*args*/, PyObject* /*kw*/) { + Py_INCREF(self); + return self; +} + +static PyObject* pycvVideoCaptureExit(PyObject* self, PyObject* /*args*/, PyObject* /*kw*/) { + Ptr* obj_getp = nullptr; + if (pyopencv_VideoCapture_getp(self, obj_getp) && obj_getp && *obj_getp) { + (*obj_getp)->release(); + } + Py_RETURN_NONE; +} + +static PyObject* pycvVideoWriterExit(PyObject* self, PyObject* /*args*/, PyObject* /*kw*/) { + Ptr* obj_getp = nullptr; + if (pyopencv_VideoWriter_getp(self, obj_getp) && obj_getp && *obj_getp) { + (*obj_getp)->release(); + } + Py_RETURN_NONE; +} + +#define PYOPENCV_EXTRA_METHODS_VideoCapture \ + {"__enter__", CV_PY_FN_WITH_KW(pycvVideoEnter), "Context manager enter"}, \ + {"__exit__", CV_PY_FN_WITH_KW(pycvVideoCaptureExit), "Context manager exit"}, + +#define PYOPENCV_EXTRA_METHODS_VideoWriter \ + {"__enter__", CV_PY_FN_WITH_KW(pycvVideoEnter), "Context manager enter"}, \ + {"__exit__", CV_PY_FN_WITH_KW(pycvVideoWriterExit), "Context manager exit"}, + + #endif // HAVE_OPENCV_VIDEOIO diff --git a/modules/videoio/misc/python/test/test_videoio.py b/modules/videoio/misc/python/test/test_videoio.py index 181ade769d..43f5bb92ff 100644 --- a/modules/videoio/misc/python/test/test_videoio.py +++ b/modules/videoio/misc/python/test/test_videoio.py @@ -5,6 +5,7 @@ import numpy as np import cv2 as cv import io import sys +import tempfile from tests_common import NewOpenCVTests @@ -87,5 +88,22 @@ class Bindings(NewOpenCVTests): self.assertTrue(hasFrame) self.assertEqual(frame.shape, (576, 768, 3)) + def test_context_manager(self): + video_file = self.find_file("cv/video/768x576.avi") + + with cv.VideoCapture(video_file) as cap: + self.assertTrue(cap.isOpened(), "VideoCapture should be opened within context manager") + + with tempfile.NamedTemporaryFile(suffix='.avi') as tmp: + with cv.VideoWriter(tmp.name, cv.VideoWriter_fourcc(*'MJPG'), 25, (640, 480)) as writer: + self.assertTrue(isinstance(writer, cv.VideoWriter)) + + try: + with cv.VideoCapture(video_file) as cap: + self.assertTrue(cap.isOpened()) + raise RuntimeError("Testing context manager exception safety") + except RuntimeError: + pass + if __name__ == '__main__': NewOpenCVTests.bootstrap()