Patch Detail
Show a patch.
GET /api/1.1/patches/13472/?format=api
{ "id": 13472, "url": "https://patchwork.libcamera.org/api/1.1/patches/13472/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13472/", "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": "<20210824195636.1110845-13-nfraprado@collabora.com>", "date": "2021-08-24T19:56:31", "name": "[libcamera-devel,v8,12/17] lc-compliance: Factor common capture code into SimpleCapture", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "b2272947e05b304ed3616dd7df36fd5d915df159", "submitter": { "id": 84, "url": "https://patchwork.libcamera.org/api/1.1/people/84/?format=api", "name": "Nícolas F. R. A. Prado", "email": "nfraprado@collabora.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/13472/mbox/", "series": [ { "id": 2389, "url": "https://patchwork.libcamera.org/api/1.1/series/2389/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2389", "date": "2021-08-24T19:56:19", "name": "lc-compliance: Add test to queue more requests than hardware depth", "version": 8, "mbox": "https://patchwork.libcamera.org/series/2389/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/13472/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13472/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 3FD63C324B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 24 Aug 2021 19:58:09 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E7B3C6891A;\n\tTue, 24 Aug 2021 21:57:40 +0200 (CEST)", "from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 908FF688A3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 24 Aug 2021 21:57:39 +0200 (CEST)", "from [127.0.0.1] (localhost [127.0.0.1])\n\t(Authenticated sender: nfraprado) with ESMTPSA id 2BF061F43379" ], "From": "=?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= <nfraprado@collabora.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 24 Aug 2021 16:56:31 -0300", "Message-Id": "<20210824195636.1110845-13-nfraprado@collabora.com>", "X-Mailer": "git-send-email 2.33.0", "In-Reply-To": "<20210824195636.1110845-1-nfraprado@collabora.com>", "References": "<20210824195636.1110845-1-nfraprado@collabora.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v8 12/17] lc-compliance: Factor common\n\tcapture code into SimpleCapture", "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>", "Cc": "kernel@collabora.com, =?utf-8?q?Andr=C3=A9_Almeida?=\n\t<andrealmeid@collabora.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Factor common code from SimpleCapture* subclasses into the SimpleCapture\nparent class in order to avoid duplicated code.\n\nSigned-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>\n\n---\n\nChanges in v8:\n- Added requests_ member to SimpleCapture to hold ownership of queued\n requests during capture\n- Made queueRequest() virtual and removed SimpleCaptureBalanced::queueRequests()\n\nChanges in v6:\n- Switched queueRequests()'s 'buffers' and 'requests' parameters order, since\n 'requests' is an output variable\n- Added comment to runCaptureSession()\n- Added missing blank line before return in captureCompleted()\n- Added blank line to runCaptureSession()\n\n src/lc-compliance/simple_capture.cpp | 93 +++++++++++++++-------------\n src/lc-compliance/simple_capture.h | 16 +++--\n 2 files changed, 61 insertions(+), 48 deletions(-)", "diff": "diff --git a/src/lc-compliance/simple_capture.cpp b/src/lc-compliance/simple_capture.cpp\nindex 041a2a4cbb5a..e4f70974dd2c 100644\n--- a/src/lc-compliance/simple_capture.cpp\n+++ b/src/lc-compliance/simple_capture.cpp\n@@ -70,12 +70,57 @@ void SimpleCapture::stop()\n \n \tcamera_->stop();\n \n+\trequests_.clear();\n+\n \tcamera_->requestCompleted.disconnect(this, &SimpleCapture::requestComplete);\n \n \tStream *stream = config_->at(0).stream();\n \tallocator_->free(stream);\n }\n \n+bool SimpleCapture::captureCompleted()\n+{\n+\tcaptureCount_++;\n+\tif (captureCount_ >= captureLimit_) {\n+\t\tloop_->exit(0);\n+\t\treturn true;\n+\t}\n+\n+\treturn false;\n+}\n+\n+int SimpleCapture::queueRequest(Request *request)\n+{\n+\treturn camera_->queueRequest(request);\n+}\n+\n+void SimpleCapture::queueRequests(Stream *stream,\n+\t\t\t\t const std::vector<std::unique_ptr<FrameBuffer>> &buffers)\n+{\n+\tfor (const std::unique_ptr<FrameBuffer> &buffer : buffers) {\n+\t\tstd::unique_ptr<Request> request = camera_->createRequest();\n+\t\tASSERT_TRUE(request) << \"Can't create request\";\n+\n+\t\tASSERT_EQ(request->addBuffer(stream, buffer.get()), 0) << \"Can't set buffer for request\";\n+\n+\t\tASSERT_EQ(queueRequest(request.get()), 0) << \"Failed to queue request\";\n+\n+\t\trequests_.push_back(std::move(request));\n+\t}\n+}\n+\n+int SimpleCapture::runCaptureSession()\n+{\n+\tloop_ = new EventLoop();\n+\tint status = loop_->exec();\n+\n+\t/* After session ended */\n+\tstop();\n+\tdelete loop_;\n+\n+\treturn status;\n+}\n+\n /* SimpleCaptureBalanced */\n \n SimpleCaptureBalanced::SimpleCaptureBalanced(std::shared_ptr<Camera> camera)\n@@ -102,24 +147,9 @@ void SimpleCaptureBalanced::capture(unsigned int numRequests)\n \tcaptureCount_ = 0;\n \tcaptureLimit_ = numRequests;\n \n-\t/* Queue the recommended number of reqeuests. */\n-\tstd::vector<std::unique_ptr<libcamera::Request>> requests;\n-\tfor (const std::unique_ptr<FrameBuffer> &buffer : buffers) {\n-\t\tstd::unique_ptr<Request> request = camera_->createRequest();\n-\t\tASSERT_TRUE(request) << \"Can't create request\";\n+\tqueueRequests(stream, buffers);\n \n-\t\tASSERT_EQ(request->addBuffer(stream, buffer.get()), 0) << \"Can't set buffer for request\";\n-\n-\t\tASSERT_EQ(queueRequest(request.get()), 0) << \"Failed to queue request\";\n-\n-\t\trequests.push_back(std::move(request));\n-\t}\n-\n-\t/* Run capture session. */\n-\tloop_ = new EventLoop();\n-\tloop_->exec();\n-\tstop();\n-\tdelete loop_;\n+\trunCaptureSession();\n \n \tASSERT_EQ(captureCount_, captureLimit_);\n }\n@@ -135,11 +165,8 @@ int SimpleCaptureBalanced::queueRequest(Request *request)\n \n void SimpleCaptureBalanced::requestComplete(Request *request)\n {\n-\tcaptureCount_++;\n-\tif (captureCount_ >= captureLimit_) {\n-\t\tloop_->exit(0);\n+\tif (captureCompleted())\n \t\treturn;\n-\t}\n \n \trequest->reuse(Request::ReuseBuffers);\n \tif (queueRequest(request))\n@@ -163,35 +190,17 @@ void SimpleCaptureUnbalanced::capture(unsigned int numRequests)\n \tcaptureCount_ = 0;\n \tcaptureLimit_ = numRequests;\n \n-\t/* Queue the recommended number of reqeuests. */\n-\tstd::vector<std::unique_ptr<libcamera::Request>> requests;\n-\tfor (const std::unique_ptr<FrameBuffer> &buffer : buffers) {\n-\t\tstd::unique_ptr<Request> request = camera_->createRequest();\n-\t\tASSERT_TRUE(request) << \"Can't create request\";\n-\n-\t\tASSERT_EQ(request->addBuffer(stream, buffer.get()), 0) << \"Can't set buffer for request\";\n-\n-\t\tASSERT_EQ(camera_->queueRequest(request.get()), 0) << \"Failed to queue request\";\n-\n-\t\trequests.push_back(std::move(request));\n-\t}\n+\tqueueRequests(stream, buffers);\n \n-\t/* Run capture session. */\n-\tloop_ = new EventLoop();\n-\tint status = loop_->exec();\n-\tstop();\n-\tdelete loop_;\n+\tint status = runCaptureSession();\n \n \tASSERT_EQ(status, 0);\n }\n \n void SimpleCaptureUnbalanced::requestComplete(Request *request)\n {\n-\tcaptureCount_++;\n-\tif (captureCount_ >= captureLimit_) {\n-\t\tloop_->exit(0);\n+\tif (captureCompleted())\n \t\treturn;\n-\t}\n \n \trequest->reuse(Request::ReuseBuffers);\n \tif (camera_->queueRequest(request))\ndiff --git a/src/lc-compliance/simple_capture.h b/src/lc-compliance/simple_capture.h\nindex 401ba8273da8..8a6db2a355f6 100644\n--- a/src/lc-compliance/simple_capture.h\n+++ b/src/lc-compliance/simple_capture.h\n@@ -25,14 +25,23 @@ protected:\n \n \tvoid start();\n \tvoid stop();\n+\tvirtual int queueRequest(libcamera::Request *request);\n+\tvoid queueRequests(libcamera::Stream *stream,\n+\t\t\t const std::vector<std::unique_ptr<libcamera::FrameBuffer>> &buffers);\n+\tbool captureCompleted();\n+\tint runCaptureSession();\n \n \tvirtual void requestComplete(libcamera::Request *request) = 0;\n \n \tEventLoop *loop_;\n \n+\tunsigned int captureCount_;\n+\tunsigned int captureLimit_;\n+\n \tstd::shared_ptr<libcamera::Camera> camera_;\n \tstd::unique_ptr<libcamera::FrameBufferAllocator> allocator_;\n \tstd::unique_ptr<libcamera::CameraConfiguration> config_;\n+\tstd::vector<std::unique_ptr<libcamera::Request>> requests_;\n };\n \n class SimpleCaptureBalanced : public SimpleCapture\n@@ -43,12 +52,10 @@ public:\n \tvoid capture(unsigned int numRequests);\n \n private:\n-\tint queueRequest(libcamera::Request *request);\n+\tint queueRequest(libcamera::Request *request) override;\n \tvoid requestComplete(libcamera::Request *request) override;\n \n \tunsigned int queueCount_;\n-\tunsigned int captureCount_;\n-\tunsigned int captureLimit_;\n };\n \n class SimpleCaptureUnbalanced : public SimpleCapture\n@@ -60,9 +67,6 @@ public:\n \n private:\n \tvoid requestComplete(libcamera::Request *request) override;\n-\n-\tunsigned int captureCount_;\n-\tunsigned int captureLimit_;\n };\n \n #endif /* __LC_COMPLIANCE_SIMPLE_CAPTURE_H__ */\n", "prefixes": [ "libcamera-devel", "v8", "12/17" ] }