{"id":12212,"url":"https://patchwork.libcamera.org/api/1.1/patches/12212/?format=json","web_url":"https://patchwork.libcamera.org/patch/12212/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20210506180249.318346-4-nfraprado@collabora.com>","date":"2021-05-06T18:02:46","name":"[libcamera-devel,v4,3/6] lc-compliance: Factor common capture code into SimpleCapture","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"ca74a5e35d5956562c81c8c663dc9c07bf6a67d2","submitter":{"id":84,"url":"https://patchwork.libcamera.org/api/1.1/people/84/?format=json","name":"Nícolas F. R. A. Prado","email":"nfraprado@collabora.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12212/mbox/","series":[{"id":2005,"url":"https://patchwork.libcamera.org/api/1.1/series/2005/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2005","date":"2021-05-06T18:02:43","name":"lc-compliance: Add test to queue more requests than hardware depth","version":4,"mbox":"https://patchwork.libcamera.org/series/2005/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12212/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12212/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 5DA4BBDE7F\n\tfor ;\n\tThu, 6 May 2021 18:04:01 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2055868923;\n\tThu, 6 May 2021 20:04:01 +0200 (CEST)","from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2A7C668921\n\tfor ;\n\tThu, 6 May 2021 20:03:59 +0200 (CEST)","from localhost.localdomain (unknown\n\t[IPv6:2804:14c:1a9:2978:995d:672b:100f:2fd9])\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 4F5101F43B8F;\n\tThu, 6 May 2021 19:03:57 +0100 (BST)"],"From":"=?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 6 May 2021 15:02:46 -0300","Message-Id":"<20210506180249.318346-4-nfraprado@collabora.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210506180249.318346-1-nfraprado@collabora.com>","References":"<20210506180249.318346-1-nfraprado@collabora.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v4 3/6] 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","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","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 src/lc-compliance/simple_capture.cpp | 142 ++++++++++++++++-----------\n src/lc-compliance/simple_capture.h | 16 ++-\n 2 files changed, 95 insertions(+), 63 deletions(-)","diff":"diff --git a/src/lc-compliance/simple_capture.cpp b/src/lc-compliance/simple_capture.cpp\nindex f961e71f1815..bb173ef1f71a 100644\n--- a/src/lc-compliance/simple_capture.cpp\n+++ b/src/lc-compliance/simple_capture.cpp\n@@ -73,6 +73,53 @@ 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+\treturn false;\n+}\n+\n+Results::Result SimpleCapture::queueRequests(Stream *stream,\n+\t\t\t\t\t std::vector> &requests,\n+\t\t\t\t\t const std::vector> &buffers)\n+{\n+\tfor (const std::unique_ptr &buffer : buffers) {\n+\t\tstd::unique_ptr request = camera_->createRequest();\n+\t\tif (!request) {\n+\t\t\tstop();\n+\t\t\treturn { Results::Fail, \"Can't create request\" };\n+\t\t}\n+\n+\t\tif (request->addBuffer(stream, buffer.get())) {\n+\t\t\tstop();\n+\t\t\treturn { Results::Fail, \"Can't set buffer for request\" };\n+\t\t}\n+\n+\t\tif (camera_->queueRequest(request.get()) < 0) {\n+\t\t\tstop();\n+\t\t\treturn { Results::Fail, \"Failed to queue request\" };\n+\t\t}\n+\n+\t\trequests.push_back(std::move(request));\n+\t}\n+\n+\treturn { Results::Pass, \"Succesfully queued requests\" };\n+}\n+\n+int SimpleCapture::runCaptureSession()\n+{\n+\tloop_ = new EventLoop();\n+\tint status = loop_->exec();\n+\tstop();\n+\tdelete loop_;\n+\n+\treturn status;\n+}\n+\n /* SimpleCaptureBalanced */\n \n SimpleCaptureBalanced::SimpleCaptureBalanced(std::shared_ptr camera)\n@@ -80,6 +127,33 @@ SimpleCaptureBalanced::SimpleCaptureBalanced(std::shared_ptr camera)\n {\n }\n \n+Results::Result SimpleCaptureBalanced::queueRequests(Stream *stream,\n+\t\t\t\t\t\t std::vector> &requests,\n+\t\t\t\t\t\t const std::vector> &buffers)\n+{\n+\tfor (const std::unique_ptr &buffer : buffers) {\n+\t\tstd::unique_ptr request = camera_->createRequest();\n+\t\tif (!request) {\n+\t\t\tstop();\n+\t\t\treturn { Results::Fail, \"Can't create request\" };\n+\t\t}\n+\n+\t\tif (request->addBuffer(stream, buffer.get())) {\n+\t\t\tstop();\n+\t\t\treturn { Results::Fail, \"Can't set buffer for request\" };\n+\t\t}\n+\n+\t\tif (queueRequest(request.get()) < 0) {\n+\t\t\tstop();\n+\t\t\treturn { Results::Fail, \"Failed to queue request\" };\n+\t\t}\n+\n+\t\trequests.push_back(std::move(request));\n+\t}\n+\n+\treturn { Results::Pass, \"Succesfully queued requests\" };\n+}\n+\n Results::Result SimpleCaptureBalanced::capture(unsigned int numRequests)\n {\n \tResults::Result ret = start();\n@@ -103,33 +177,12 @@ Results::Result 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\tif (!request) {\n-\t\t\tstop();\n-\t\t\treturn { Results::Fail, \"Can't create request\" };\n-\t\t}\n-\n-\t\tif (request->addBuffer(stream, buffer.get())) {\n-\t\t\tstop();\n-\t\t\treturn { Results::Fail, \"Can't set buffer for request\" };\n-\t\t}\n-\n-\t\tif (queueRequest(request.get()) < 0) {\n-\t\t\tstop();\n-\t\t\treturn { Results::Fail, \"Failed to queue request\" };\n-\t\t}\n+\tret = queueRequests(stream, requests, buffers);\n+\tif (ret.first != Results::Pass)\n+\t\treturn ret;\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 \tif (captureCount_ != captureLimit_)\n \t\treturn { Results::Fail, \"Got \" + std::to_string(captureCount_) +\n@@ -150,11 +203,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@@ -180,44 +230,20 @@ Results::Result 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\tif (!request) {\n-\t\t\tstop();\n-\t\t\treturn { Results::Fail, \"Can't create request\" };\n-\t\t}\n-\n-\t\tif (request->addBuffer(stream, buffer.get())) {\n-\t\t\tstop();\n-\t\t\treturn { Results::Fail, \"Can't set buffer for request\" };\n-\t\t}\n-\n-\t\tif (camera_->queueRequest(request.get()) < 0) {\n-\t\t\tstop();\n-\t\t\treturn { Results::Fail, \"Failed to queue request\" };\n-\t\t}\n-\n-\t\trequests.push_back(std::move(request));\n-\t}\n+\tret = queueRequests(stream, requests, buffers);\n+\tif (ret.first != Results::Pass)\n+\t\treturn ret;\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 \treturn { status ? Results::Fail : Results::Pass, \"Unbalanced capture of \" + std::to_string(numRequests) + \" requests\" };\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 82e2c56a55f1..8d0f94f0c3e5 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 \tResults::Result start();\n \tvoid stop();\n+\tResults::Result queueRequests(libcamera::Stream *stream,\n+\t\t\t\t std::vector> &requests,\n+\t\t\t\t const std::vector> &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 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+\tResults::Result queueRequests(libcamera::Stream *stream,\n+\t\t\t\t std::vector> &requests,\n+\t\t\t\t const std::vector> &buffers);\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","v4","3/6"]}