{"id":13078,"url":"https://patchwork.libcamera.org/api/patches/13078/?format=json","web_url":"https://patchwork.libcamera.org/patch/13078/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210722232851.747614-5-nfraprado@collabora.com>","date":"2021-07-22T23:28:44","name":"[libcamera-devel,v7,04/11] lc-compliance: Factor common capture code into SimpleCapture","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"d984b7eeb516c6ae60cd86e3bce961d1683cf506","submitter":{"id":84,"url":"https://patchwork.libcamera.org/api/people/84/?format=json","name":"Nícolas F. R. A. Prado","email":"nfraprado@collabora.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13078/mbox/","series":[{"id":2269,"url":"https://patchwork.libcamera.org/api/series/2269/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2269","date":"2021-07-22T23:28:40","name":"lc-compliance: Add test to queue more requests than hardware depth","version":7,"mbox":"https://patchwork.libcamera.org/series/2269/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13078/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13078/checks/","tags":{},"headers":{"Return-Path":"","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 7DFB6C0109\n\tfor ;\n\tThu, 22 Jul 2021 23:29:34 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 48FE46877A;\n\tFri, 23 Jul 2021 01:29:34 +0200 (CEST)","from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7BF28687A9\n\tfor ;\n\tFri, 23 Jul 2021 01:29:32 +0200 (CEST)","from localhost.localdomain (unknown\n\t[IPv6:2804:14c:1a9:2434:a4c5:aa5e:1d8c:5e2c])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128\n\tbits))\n\t(No client certificate requested) (Authenticated sender: nfraprado)\n\tby bhuna.collabora.co.uk (Postfix) with ESMTPSA id B73F81F447E3;\n\tFri, 23 Jul 2021 00:29:30 +0100 (BST)"],"From":"=?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 22 Jul 2021 20:28:44 -0300","Message-Id":"<20210722232851.747614-5-nfraprado@collabora.com>","X-Mailer":"git-send-email 2.32.0","In-Reply-To":"<20210722232851.747614-1-nfraprado@collabora.com>","References":"<20210722232851.747614-1-nfraprado@collabora.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v7 04/11] 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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"kernel@collabora.com, =?utf-8?q?Andr=C3=A9_Almeida?=\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"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 \n---\n\nNo changes in v7\n\nChanges in v6:\n- Added missing blank line before return in captureCompleted()\n- Switched queueRequests()'s 'buffers' and 'requests' parameters order, since\n 'requests' is an output variable\n- Added comment and blank line to runCaptureSession() \n\n src/lc-compliance/simple_capture.cpp | 101 ++++++++++++++++-----------\n src/lc-compliance/simple_capture.h | 16 +++--\n 2 files changed, 72 insertions(+), 45 deletions(-)","diff":"diff --git a/src/lc-compliance/simple_capture.cpp b/src/lc-compliance/simple_capture.cpp\nindex 8683d9050806..06ef44ef7e42 100644\n--- a/src/lc-compliance/simple_capture.cpp\n+++ b/src/lc-compliance/simple_capture.cpp\n@@ -78,6 +78,45 @@ void SimpleCapture::stop()\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+void SimpleCapture::queueRequests(Stream *stream,\n+\t\t\t\t const std::vector> &buffers,\n+\t\t\t\t std::vector> &requests)\n+{\n+\tfor (const std::unique_ptr &buffer : buffers) {\n+\t\tstd::unique_ptr 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+}\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)\n@@ -85,6 +124,22 @@ SimpleCaptureBalanced::SimpleCaptureBalanced(std::shared_ptr camera)\n {\n }\n \n+void SimpleCaptureBalanced::queueRequests(Stream *stream,\n+\t\t\t\t\t const std::vector> &buffers,\n+\t\t\t\t\t std::vector> &requests)\n+{\n+\tfor (const std::unique_ptr &buffer : buffers) {\n+\t\tstd::unique_ptr 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 void SimpleCaptureBalanced::capture(unsigned int numRequests)\n {\n \tstart();\n@@ -104,24 +159,10 @@ void SimpleCaptureBalanced::capture(unsigned int numRequests)\n \tcaptureCount_ = 0;\n \tcaptureLimit_ = numRequests;\n \n-\t/* Queue the recommended number of reqeuests. */\n \tstd::vector> requests;\n-\tfor (const std::unique_ptr &buffer : buffers) {\n-\t\tstd::unique_ptr 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+\tqueueRequests(stream, buffers, requests);\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@@ -137,11 +178,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@@ -165,35 +203,18 @@ void SimpleCaptureUnbalanced::capture(unsigned int numRequests)\n \tcaptureCount_ = 0;\n \tcaptureLimit_ = numRequests;\n \n-\t/* Queue the recommended number of reqeuests. */\n \tstd::vector> requests;\n-\tfor (const std::unique_ptr &buffer : buffers) {\n-\t\tstd::unique_ptr 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+\tqueueRequests(stream, buffers, requests);\n \n-\t\trequests.push_back(std::move(request));\n-\t}\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 1a1e874a528c..0f9a060fece3 100644\n--- a/src/lc-compliance/simple_capture.h\n+++ b/src/lc-compliance/simple_capture.h\n@@ -26,11 +26,19 @@ protected:\n \n \tvoid start();\n \tvoid stop();\n+\tvoid queueRequests(libcamera::Stream *stream,\n+\t\t\t const std::vector> &buffers,\n+\t\t\t std::vector> &requests);\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 camera_;\n \tstd::unique_ptr allocator_;\n \tstd::unique_ptr config_;\n@@ -46,10 +54,11 @@ public:\n private:\n \tint queueRequest(libcamera::Request *request);\n \tvoid requestComplete(libcamera::Request *request) override;\n+\tvoid queueRequests(libcamera::Stream *stream,\n+\t\t\t const std::vector> &buffers,\n+\t\t\t std::vector> &requests);\n \n \tunsigned int queueCount_;\n-\tunsigned int captureCount_;\n-\tunsigned int captureLimit_;\n };\n \n class SimpleCaptureUnbalanced : public SimpleCapture\n@@ -61,9 +70,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","v7","04/11"]}