Patch Detail
Show a patch.
GET /api/1.1/patches/18659/?format=api
{ "id": 18659, "url": "https://patchwork.libcamera.org/api/1.1/patches/18659/?format=api", "web_url": "https://patchwork.libcamera.org/patch/18659/", "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": "<20230530092016.34953-4-tomi.valkeinen@ideasonboard.com>", "date": "2023-05-30T09:20:14", "name": "[libcamera-devel,3/5] py: Use exceptions instead of returning error codes", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "648f188cabc04c618de304b5d5009f5e2b1599c6", "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/18659/mbox/", "series": [ { "id": 3893, "url": "https://patchwork.libcamera.org/api/1.1/series/3893/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3893", "date": "2023-05-30T09:20:11", "name": "py: Misc changes & move to mainline pybind11", "version": 1, "mbox": "https://patchwork.libcamera.org/series/3893/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/18659/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/18659/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 5F3B0C3213\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 30 May 2023 09:21:02 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0EA536038D;\n\tTue, 30 May 2023 11:21:02 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AFCF5627D3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 30 May 2023 11:20:57 +0200 (CEST)", "from desky.lan (91-154-35-171.elisa-laajakaista.fi [91.154.35.171])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2F5AA9B4;\n\tTue, 30 May 2023 11:20:36 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1685438462;\n\tbh=vor/8VFXBSwcad861uC0Bh5PAebGtD5tQjB9N0YwC/4=;\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=Sd9QANuNaLpSe6Gf5ooUAXzmMmCMnCZ0dar8oiINwBgyUQqM2Gp/Jl5gAULb+wjTT\n\tVW8vbU81jM4o4+BZFFGe1EqoKWK3j60wVkSKgKhLnHT958ZMR97mgnbob69y40+/xv\n\tmD7GZ+oJia20A3Wq10orp4Uk9wjKsyFEffJRXgexamMyH512Ph4kNfubY3spkDydDD\n\t5gMlFVKMO+wgplEnHZbcLqxGGhGmQjqQVZrGH3PHkGk7xcDjlTrr0bg4kwDgDQSYKA\n\t29C47QRV47Vfi7j8Yt6nWSqWr+BmC6cNG2TG/sdW00ORYB9Ckp5odnKQS0uUUlfNvC\n\t+mzWv2vDz1Axg==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1685438436;\n\tbh=vor/8VFXBSwcad861uC0Bh5PAebGtD5tQjB9N0YwC/4=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Bzm7nZWSi9IT+CwpRrrtxzvu5RmeeIF0OpvuBqJ8h+DjVX8uzI2vMzOjfvkUUN+cP\n\tdehQEvmscakbY8uWFgKLLqOf2ZNDIys1Wa9Mun3Q5ho5FPRyz+KADeM94btUuEEfgO\n\t/07z23nakxFvfNFPkQg3pSGEtp1CopWiV9ucRipE=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"Bzm7nZWS\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 30 May 2023 12:20:14 +0300", "Message-Id": "<20230530092016.34953-4-tomi.valkeinen@ideasonboard.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20230530092016.34953-1-tomi.valkeinen@ideasonboard.com>", "References": "<20230530092016.34953-1-tomi.valkeinen@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 3/5] py: Use exceptions instead of\n\treturning error codes", "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": "We have multiple methods which return an error code, mimicking the C++\nAPI. Using exceptions is more natural in the Python API, so change all\nthose methods to raise an Exception instead.\n\nSigned-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/py/cam/cam.py | 16 +----\n src/py/examples/simple-cam.py | 15 +---\n src/py/examples/simple-capture.py | 21 ++----\n src/py/examples/simple-continuous-capture.py | 21 ++----\n src/py/libcamera/py_main.cpp | 60 ++++++++++++----\n test/py/unittests.py | 76 +++++++-------------\n 6 files changed, 91 insertions(+), 118 deletions(-)", "diff": "diff --git a/src/py/cam/cam.py b/src/py/cam/cam.py\nindex 967a72f5..a2a115c1 100755\n--- a/src/py/cam/cam.py\n+++ b/src/py/cam/cam.py\n@@ -158,9 +158,7 @@ class CameraContext:\n \n print('Camera configuration adjusted')\n \n- r = self.camera.configure(camconfig)\n- if r != 0:\n- raise Exception('Configure failed')\n+ self.camera.configure(camconfig)\n \n self.stream_names = {}\n self.streams = []\n@@ -175,12 +173,7 @@ class CameraContext:\n allocator = libcam.FrameBufferAllocator(self.camera)\n \n for stream in self.streams:\n- ret = allocator.allocate(stream)\n- if ret < 0:\n- print('Cannot allocate buffers')\n- exit(-1)\n-\n- allocated = len(allocator.buffers(stream))\n+ allocated = allocator.allocate(stream)\n \n print('{}-{}: Allocated {} buffers'.format(self.id, self.stream_names[stream], allocated))\n \n@@ -205,10 +198,7 @@ class CameraContext:\n buffers = self.allocator.buffers(stream)\n buffer = buffers[buf_num]\n \n- ret = request.add_buffer(stream, buffer)\n- if ret < 0:\n- print('Can not set buffer for request')\n- exit(-1)\n+ request.add_buffer(stream, buffer)\n \n requests.append(request)\n \ndiff --git a/src/py/examples/simple-cam.py b/src/py/examples/simple-cam.py\nindex b3e97ca7..1cd1019d 100755\n--- a/src/py/examples/simple-cam.py\n+++ b/src/py/examples/simple-cam.py\n@@ -259,12 +259,7 @@ def main():\n allocator = libcam.FrameBufferAllocator(camera)\n \n for cfg in config:\n- ret = allocator.allocate(cfg.stream)\n- if ret < 0:\n- print('Can\\'t allocate buffers')\n- return -1\n-\n- allocated = len(allocator.buffers(cfg.stream))\n+ allocated = allocator.allocate(cfg.stream)\n print(f'Allocated {allocated} buffers for stream')\n \n # --------------------------------------------------------------------\n@@ -289,15 +284,9 @@ def main():\n requests = []\n for i in range(len(buffers)):\n request = camera.create_request()\n- if not request:\n- print('Can\\'t create request')\n- return -1\n \n buffer = buffers[i]\n- ret = request.add_buffer(stream, buffer)\n- if ret < 0:\n- print('Can\\'t set buffer for request')\n- return -1\n+ request.add_buffer(stream, buffer)\n \n # Controls can be added to a request on a per frame basis.\n request.set_control(libcam.controls.Brightness, 0.5)\ndiff --git a/src/py/examples/simple-capture.py b/src/py/examples/simple-capture.py\nindex 5f93574f..4b85408f 100755\n--- a/src/py/examples/simple-capture.py\n+++ b/src/py/examples/simple-capture.py\n@@ -43,8 +43,7 @@ def main():\n \n # Acquire the camera for our use\n \n- ret = cam.acquire()\n- assert ret == 0\n+ cam.acquire()\n \n # Configure the camera\n \n@@ -60,8 +59,7 @@ def main():\n w, h = [int(v) for v in args.size.split('x')]\n stream_config.size = libcam.Size(w, h)\n \n- ret = cam.configure(cam_config)\n- assert ret == 0\n+ cam.configure(cam_config)\n \n print(f'Capturing {TOTAL_FRAMES} frames with {stream_config}')\n \n@@ -83,15 +81,13 @@ def main():\n req = cam.create_request(i)\n \n buffer = allocator.buffers(stream)[i]\n- ret = req.add_buffer(stream, buffer)\n- assert ret == 0\n+ req.add_buffer(stream, buffer)\n \n reqs.append(req)\n \n # Start the camera\n \n- ret = cam.start()\n- assert ret == 0\n+ cam.start()\n \n # frames_queued and frames_done track the number of frames queued and done\n \n@@ -101,8 +97,7 @@ def main():\n # Queue the requests to the camera\n \n for req in reqs:\n- ret = cam.queue_request(req)\n- assert ret == 0\n+ cam.queue_request(req)\n frames_queued += 1\n \n # The main loop. Wait for the queued Requests to complete, process them,\n@@ -155,13 +150,11 @@ def main():\n \n # Stop the camera\n \n- ret = cam.stop()\n- assert ret == 0\n+ cam.stop()\n \n # Release the camera\n \n- ret = cam.release()\n- assert ret == 0\n+ cam.release()\n \n return 0\n \ndiff --git a/src/py/examples/simple-continuous-capture.py b/src/py/examples/simple-continuous-capture.py\nindex 26a8060b..e1cb931e 100755\n--- a/src/py/examples/simple-continuous-capture.py\n+++ b/src/py/examples/simple-continuous-capture.py\n@@ -28,8 +28,7 @@ class CameraCaptureContext:\n \n # Acquire the camera for our use\n \n- ret = cam.acquire()\n- assert ret == 0\n+ cam.acquire()\n \n # Configure the camera\n \n@@ -37,8 +36,7 @@ class CameraCaptureContext:\n \n stream_config = cam_config.at(0)\n \n- ret = cam.configure(cam_config)\n- assert ret == 0\n+ cam.configure(cam_config)\n \n stream = stream_config.stream\n \n@@ -62,8 +60,7 @@ class CameraCaptureContext:\n req = cam.create_request(idx)\n \n buffer = allocator.buffers(stream)[i]\n- ret = req.add_buffer(stream, buffer)\n- assert ret == 0\n+ req.add_buffer(stream, buffer)\n \n self.reqs.append(req)\n \n@@ -73,13 +70,11 @@ class CameraCaptureContext:\n def uninit_camera(self):\n # Stop the camera\n \n- ret = self.cam.stop()\n- assert ret == 0\n+ self.cam.stop()\n \n # Release the camera\n \n- ret = self.cam.release()\n- assert ret == 0\n+ self.cam.release()\n \n \n # A container class for our state\n@@ -145,8 +140,7 @@ class CaptureContext:\n \n for cam_ctx in self.camera_contexts:\n for req in cam_ctx.reqs:\n- ret = cam_ctx.cam.queue_request(req)\n- assert ret == 0\n+ cam_ctx.cam.queue_request(req)\n \n # Use Selector to wait for events from the camera and from the keyboard\n \n@@ -177,8 +171,7 @@ def main():\n # Start the cameras\n \n for cam_ctx in ctx.camera_contexts:\n- ret = cam_ctx.cam.start()\n- assert ret == 0\n+ cam_ctx.cam.start()\n \n ctx.capture()\n \ndiff --git a/src/py/libcamera/py_main.cpp b/src/py/libcamera/py_main.cpp\nindex 56d0717e..c66b90cd 100644\n--- a/src/py/libcamera/py_main.cpp\n+++ b/src/py/libcamera/py_main.cpp\n@@ -112,8 +112,18 @@ PYBIND11_MODULE(_libcamera, m)\n \n \tpyCamera\n \t\t.def_property_readonly(\"id\", &Camera::id)\n-\t\t.def(\"acquire\", &Camera::acquire)\n-\t\t.def(\"release\", &Camera::release)\n+\t\t.def(\"acquire\", [](Camera &self) {\n+\t\t\tint ret = self.acquire();\n+\t\t\tif (ret)\n+\t\t\t\tthrow std::system_error(-ret, std::generic_category(),\n+\t\t\t\t\t\t\t\"Failed to acquire camera\");\n+\t\t})\n+\t\t.def(\"release\", [](Camera &self) {\n+\t\t\tint ret = self.release();\n+\t\t\tif (ret)\n+\t\t\t\tthrow std::system_error(-ret, std::generic_category(),\n+\t\t\t\t\t\t\t\"Failed to release camera\");\n+\t\t})\n \t\t.def(\"start\", [](Camera &self,\n \t\t const std::unordered_map<const ControlId *, py::object> &controls) {\n \t\t\t/* \\todo What happens if someone calls start() multiple times? */\n@@ -133,20 +143,19 @@ PYBIND11_MODULE(_libcamera, m)\n \t\t\tint ret = self.start(&controlList);\n \t\t\tif (ret) {\n \t\t\t\tself.requestCompleted.disconnect();\n-\t\t\t\treturn ret;\n+\t\t\t\tthrow std::system_error(-ret, std::generic_category(),\n+\t\t\t\t\t\t\t\"Failed to start camera\");\n \t\t\t}\n-\n-\t\t\treturn 0;\n \t\t}, py::arg(\"controls\") = std::unordered_map<const ControlId *, py::object>())\n \n \t\t.def(\"stop\", [](Camera &self) {\n \t\t\tint ret = self.stop();\n-\t\t\tif (ret)\n-\t\t\t\treturn ret;\n \n \t\t\tself.requestCompleted.disconnect();\n \n-\t\t\treturn 0;\n+\t\t\tif (ret)\n+\t\t\t\tthrow std::system_error(-ret, std::generic_category(),\n+\t\t\t\t\t\t\t\"Failed to stop camera\");\n \t\t})\n \n \t\t.def(\"__str__\", [](Camera &self) {\n@@ -155,9 +164,20 @@ PYBIND11_MODULE(_libcamera, m)\n \n \t\t/* Keep the camera alive, as StreamConfiguration contains a Stream* */\n \t\t.def(\"generate_configuration\", &Camera::generateConfiguration, py::keep_alive<0, 1>())\n-\t\t.def(\"configure\", &Camera::configure)\n+\t\t.def(\"configure\", [](Camera &self, CameraConfiguration *config) {\n+\t\t\tint ret = self.configure(config);\n+\t\t\tif (ret)\n+\t\t\t\tthrow std::system_error(-ret, std::generic_category(),\n+\t\t\t\t\t\t\t\"Failed to configure camera\");\n+\t\t})\n \n-\t\t.def(\"create_request\", &Camera::createRequest, py::arg(\"cookie\") = 0)\n+\t\t.def(\"create_request\", [](Camera &self, uint64_t cookie) {\n+\t\t\tstd::unique_ptr<Request> req = self.createRequest(cookie);\n+\t\t\tif (!req)\n+\t\t\t\tthrow std::system_error(ENOMEM, std::generic_category(),\n+\t\t\t\t\t\t\t\"Failed to create request\");\n+\t\t\treturn req;\n+\t\t}, py::arg(\"cookie\") = 0)\n \n \t\t.def(\"queue_request\", [](Camera &self, Request *req) {\n \t\t\tpy::object py_req = py::cast(req);\n@@ -170,10 +190,11 @@ PYBIND11_MODULE(_libcamera, m)\n \t\t\tpy_req.inc_ref();\n \n \t\t\tint ret = self.queueRequest(req);\n-\t\t\tif (ret)\n+\t\t\tif (ret) {\n \t\t\t\tpy_req.dec_ref();\n-\n-\t\t\treturn ret;\n+\t\t\t\tthrow std::system_error(-ret, std::generic_category(),\n+\t\t\t\t\t\t\t\"Failed to queue request\");\n+\t\t\t}\n \t\t})\n \n \t\t.def_property_readonly(\"streams\", [](Camera &self) {\n@@ -251,7 +272,13 @@ PYBIND11_MODULE(_libcamera, m)\n \n \tpyFrameBufferAllocator\n \t\t.def(py::init<std::shared_ptr<Camera>>(), py::keep_alive<1, 2>())\n-\t\t.def(\"allocate\", &FrameBufferAllocator::allocate)\n+\t\t.def(\"allocate\", [](FrameBufferAllocator &self, Stream *stream) {\n+\t\t\tint ret = self.allocate(stream);\n+\t\t\tif (ret < 0)\n+\t\t\t\tthrow std::system_error(-ret, std::generic_category(),\n+\t\t\t\t\t\t\t\"Failed to allocate buffers\");\n+\t\t\treturn ret;\n+\t\t})\n \t\t.def_property_readonly(\"allocated\", &FrameBufferAllocator::allocated)\n \t\t/* Create a list of FrameBuffers, where each FrameBuffer has a keep-alive to FrameBufferAllocator */\n \t\t.def(\"buffers\", [](FrameBufferAllocator &self, Stream *stream) {\n@@ -328,7 +355,10 @@ PYBIND11_MODULE(_libcamera, m)\n \tpyRequest\n \t\t/* \\todo Fence is not supported, so we cannot expose addBuffer() directly */\n \t\t.def(\"add_buffer\", [](Request &self, const Stream *stream, FrameBuffer *buffer) {\n-\t\t\treturn self.addBuffer(stream, buffer);\n+\t\t\tint ret = self.addBuffer(stream, buffer);\n+\t\t\tif (ret)\n+\t\t\t\tthrow std::system_error(-ret, std::generic_category(),\n+\t\t\t\t\t\t\t\"Failed to add buffer\");\n \t\t}, py::keep_alive<1, 3>()) /* Request keeps Framebuffer alive */\n \t\t.def_property_readonly(\"status\", &Request::status)\n \t\t.def_property_readonly(\"buffers\", &Request::buffers)\ndiff --git a/test/py/unittests.py b/test/py/unittests.py\nindex 90b04330..0057ec92 100755\n--- a/test/py/unittests.py\n+++ b/test/py/unittests.py\n@@ -42,31 +42,26 @@ class SimpleTestMethods(BaseTestCase):\n cam = cm.get('platform/vimc.0 Sensor B')\n self.assertIsNotNone(cam)\n \n- ret = cam.acquire()\n- self.assertZero(ret)\n+ cam.acquire()\n \n- ret = cam.release()\n- self.assertZero(ret)\n+ cam.release()\n \n def test_double_acquire(self):\n cm = libcam.CameraManager.singleton()\n cam = cm.get('platform/vimc.0 Sensor B')\n self.assertIsNotNone(cam)\n \n- ret = cam.acquire()\n- self.assertZero(ret)\n+ cam.acquire()\n \n libcam.log_set_level('Camera', 'FATAL')\n- ret = cam.acquire()\n- self.assertEqual(ret, -errno.EBUSY)\n+ with self.assertRaises(RuntimeError):\n+ cam.acquire()\n libcam.log_set_level('Camera', 'ERROR')\n \n- ret = cam.release()\n- self.assertZero(ret)\n+ cam.release()\n \n- ret = cam.release()\n- # I expected EBUSY, but looks like double release works fine\n- self.assertZero(ret)\n+ # I expected exception here, but looks like double release works fine\n+ cam.release()\n \n def test_version(self):\n cm = libcam.CameraManager.singleton()\n@@ -84,11 +79,7 @@ class CameraTesterBase(BaseTestCase):\n self.cm = None\n self.skipTest('No vimc found')\n \n- ret = self.cam.acquire()\n- if ret != 0:\n- self.cam = None\n- self.cm = None\n- raise Exception('Failed to acquire camera')\n+ self.cam.acquire()\n \n self.wr_cam = weakref.ref(self.cam)\n self.wr_cm = weakref.ref(self.cm)\n@@ -97,9 +88,7 @@ class CameraTesterBase(BaseTestCase):\n # If a test fails, the camera may be in running state. So always stop.\n self.cam.stop()\n \n- ret = self.cam.release()\n- if ret != 0:\n- raise Exception('Failed to release camera')\n+ self.cam.release()\n \n self.cam = None\n self.cm = None\n@@ -119,8 +108,7 @@ class AllocatorTestMethods(CameraTesterBase):\n streamconfig = camconfig.at(0)\n wr_streamconfig = weakref.ref(streamconfig)\n \n- ret = cam.configure(camconfig)\n- self.assertZero(ret)\n+ cam.configure(camconfig)\n \n stream = streamconfig.stream\n wr_stream = weakref.ref(stream)\n@@ -133,8 +121,8 @@ class AllocatorTestMethods(CameraTesterBase):\n self.assertIsNotNone(wr_streamconfig())\n \n allocator = libcam.FrameBufferAllocator(cam)\n- ret = allocator.allocate(stream)\n- self.assertTrue(ret > 0)\n+ num_bufs = allocator.allocate(stream)\n+ self.assertTrue(num_bufs > 0)\n wr_allocator = weakref.ref(allocator)\n \n buffers = allocator.buffers(stream)\n@@ -177,14 +165,13 @@ class SimpleCaptureMethods(CameraTesterBase):\n self.assertIsNotNone(fmts)\n fmts = None\n \n- ret = cam.configure(camconfig)\n- self.assertZero(ret)\n+ cam.configure(camconfig)\n \n stream = streamconfig.stream\n \n allocator = libcam.FrameBufferAllocator(cam)\n- ret = allocator.allocate(stream)\n- self.assertTrue(ret > 0)\n+ num_bufs = allocator.allocate(stream)\n+ self.assertTrue(num_bufs > 0)\n \n num_bufs = len(allocator.buffers(stream))\n \n@@ -194,19 +181,16 @@ class SimpleCaptureMethods(CameraTesterBase):\n self.assertIsNotNone(req)\n \n buffer = allocator.buffers(stream)[i]\n- ret = req.add_buffer(stream, buffer)\n- self.assertZero(ret)\n+ req.add_buffer(stream, buffer)\n \n reqs.append(req)\n \n buffer = None\n \n- ret = cam.start()\n- self.assertZero(ret)\n+ cam.start()\n \n for req in reqs:\n- ret = cam.queue_request(req)\n- self.assertZero(ret)\n+ cam.queue_request(req)\n \n reqs = None\n gc.collect()\n@@ -234,8 +218,7 @@ class SimpleCaptureMethods(CameraTesterBase):\n reqs = None\n gc.collect()\n \n- ret = cam.stop()\n- self.assertZero(ret)\n+ cam.stop()\n \n def test_select(self):\n cm = self.cm\n@@ -249,14 +232,13 @@ class SimpleCaptureMethods(CameraTesterBase):\n self.assertIsNotNone(fmts)\n fmts = None\n \n- ret = cam.configure(camconfig)\n- self.assertZero(ret)\n+ cam.configure(camconfig)\n \n stream = streamconfig.stream\n \n allocator = libcam.FrameBufferAllocator(cam)\n- ret = allocator.allocate(stream)\n- self.assertTrue(ret > 0)\n+ num_bufs = allocator.allocate(stream)\n+ self.assertTrue(num_bufs > 0)\n \n num_bufs = len(allocator.buffers(stream))\n \n@@ -266,19 +248,16 @@ class SimpleCaptureMethods(CameraTesterBase):\n self.assertIsNotNone(req)\n \n buffer = allocator.buffers(stream)[i]\n- ret = req.add_buffer(stream, buffer)\n- self.assertZero(ret)\n+ req.add_buffer(stream, buffer)\n \n reqs.append(req)\n \n buffer = None\n \n- ret = cam.start()\n- self.assertZero(ret)\n+ cam.start()\n \n for req in reqs:\n- ret = cam.queue_request(req)\n- self.assertZero(ret)\n+ cam.queue_request(req)\n \n reqs = None\n gc.collect()\n@@ -307,8 +286,7 @@ class SimpleCaptureMethods(CameraTesterBase):\n reqs = None\n gc.collect()\n \n- ret = cam.stop()\n- self.assertZero(ret)\n+ cam.stop()\n \n \n # Recursively expand slist's objects into olist, using seen to track already\n", "prefixes": [ "libcamera-devel", "3/5" ] }