{"id":12861,"url":"https://patchwork.libcamera.org/api/patches/12861/?format=json","web_url":"https://patchwork.libcamera.org/patch/12861/","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":"<20210707144202.1327061-8-nfraprado@collabora.com>","date":"2021-07-07T14:41:59","name":"[libcamera-devel,v5,07/10] lc-compliance: Add test to queue more requests than hardware depth","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"9c04fe4badb60b15a1ec942d0a463844cc7adb3a","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/12861/mbox/","series":[{"id":2216,"url":"https://patchwork.libcamera.org/api/series/2216/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2216","date":"2021-07-07T14:41:52","name":"lc-compliance: Add test to queue more requests than hardware depth","version":5,"mbox":"https://patchwork.libcamera.org/series/2216/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12861/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12861/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 AC0A2BD794\n\tfor ;\n\tWed, 7 Jul 2021 14:42:35 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 78FC66851A;\n\tWed, 7 Jul 2021 16:42:35 +0200 (CEST)","from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AFE8960284\n\tfor ;\n\tWed, 7 Jul 2021 16:42:33 +0200 (CEST)","from localhost.localdomain (unknown\n\t[IPv6:2804:14c:1a9:2434:6553:ad0c:9d2a:24db])\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 04F661F434D4;\n\tWed, 7 Jul 2021 15:42:31 +0100 (BST)"],"From":"=?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 7 Jul 2021 11:41:59 -0300","Message-Id":"<20210707144202.1327061-8-nfraprado@collabora.com>","X-Mailer":"git-send-email 2.32.0","In-Reply-To":"<20210707144202.1327061-1-nfraprado@collabora.com>","References":"<20210707144202.1327061-1-nfraprado@collabora.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v5 07/10] lc-compliance: Add test to queue\n\tmore requests than hardware depth","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":"A pipeline handler should be able to handle an arbitrary number of\nsimultaneous requests by submitting what it can to the video device and\nqueuing the rest internally until resources are available. This isn't\ncurrently done by some pipeline handlers however [1].\n\nAdd a new test to lc-compliance that submits a lot of requests at once\nto check if the pipeline handler is behaving well in this situation.\n\n[1] https://bugs.libcamera.org/show_bug.cgi?id=24\n\nSigned-off-by: Nícolas F. R. A. Prado \n---\n\nChanges in v5:\n- Updated to use googletest, and CameraHolder and roleToString from previous\n patches\n\n src/lc-compliance/capture_test.cpp | 45 ++++++++++++++++++++++++++++\n src/lc-compliance/simple_capture.cpp | 30 +++++++++++++++++++\n src/lc-compliance/simple_capture.h | 11 +++++++\n 3 files changed, 86 insertions(+)","diff":"diff --git a/src/lc-compliance/capture_test.cpp b/src/lc-compliance/capture_test.cpp\nindex b4807486ee07..bb04e9ac100e 100644\n--- a/src/lc-compliance/capture_test.cpp\n+++ b/src/lc-compliance/capture_test.cpp\n@@ -18,6 +18,8 @@ using namespace libcamera;\n const std::vector NUMREQUESTS = { 1, 2, 3, 5, 8, 13, 21, 34, 55, 89 };\n const std::vector ROLES = { Raw, StillCapture, VideoRecording, Viewfinder };\n \n+static const unsigned int MAX_SIMULTANEOUS_REQUESTS = 8;\n+\n static const std::string &roleToString(const StreamRole &role)\n {\n \tstatic std::map rolesMap = { { Raw, \"Raw\" },\n@@ -79,12 +81,37 @@ void SingleStream::TearDown()\n \treleaseCamera();\n }\n \n+class RoleParametrizedTest : public testing::TestWithParam, public CameraHolder\n+{\n+public:\n+\tstatic std::string nameParameters(const testing::TestParamInfo &info);\n+\n+protected:\n+\tvoid SetUp() override;\n+\tvoid TearDown() override;\n+};\n+\n+void RoleParametrizedTest::SetUp()\n+{\n+\tacquireCamera();\n+}\n+\n+void RoleParametrizedTest::TearDown()\n+{\n+\treleaseCamera();\n+}\n+\n std::string SingleStream::nameParameters(const testing::TestParamInfo &info)\n {\n \treturn roleToString(std::get<0>(info.param)) + \"_\" +\n \t std::to_string(std::get<1>(info.param));\n }\n \n+std::string RoleParametrizedTest::nameParameters(const testing::TestParamInfo &info)\n+{\n+\treturn roleToString(info.param);\n+}\n+\n /*\n * Test single capture cycles\n *\n@@ -147,8 +174,26 @@ TEST_P(SingleStream, UnbalancedStop)\n \tcapture.capture(numRequests);\n }\n \n+TEST_P(RoleParametrizedTest, Overflow)\n+{\n+\tauto role = GetParam();\n+\n+\tSimpleCaptureOverflow capture(camera_);\n+\n+\tcapture.configure(role);\n+\n+\tcapture.allocateBuffers(MAX_SIMULTANEOUS_REQUESTS);\n+\n+\tcapture.capture();\n+}\n+\n INSTANTIATE_TEST_SUITE_P(CaptureTests,\n \t\t\t SingleStream,\n \t\t\t testing::Combine(testing::ValuesIn(ROLES),\n \t\t\t\t\t testing::ValuesIn(NUMREQUESTS)),\n \t\t\t SingleStream::nameParameters);\n+\n+INSTANTIATE_TEST_SUITE_P(CaptureTests,\n+\t\t\t RoleParametrizedTest,\n+\t\t\t testing::ValuesIn(ROLES),\n+\t\t\t RoleParametrizedTest::nameParameters);\ndiff --git a/src/lc-compliance/simple_capture.cpp b/src/lc-compliance/simple_capture.cpp\nindex c28a6107ee87..5aecc1ab0afc 100644\n--- a/src/lc-compliance/simple_capture.cpp\n+++ b/src/lc-compliance/simple_capture.cpp\n@@ -217,3 +217,33 @@ void SimpleCaptureUnbalanced::requestComplete(Request *request)\n \tif (camera_->queueRequest(request))\n \t\tloop_->exit(-EINVAL);\n }\n+\n+/* SimpleCaptureOverflow */\n+\n+SimpleCaptureOverflow::SimpleCaptureOverflow(std::shared_ptr camera)\n+\t: SimpleCapture(camera)\n+{\n+}\n+\n+void SimpleCaptureOverflow::capture()\n+{\n+\tstart();\n+\n+\tStream *stream = config_->at(0).stream();\n+\tconst std::vector> &buffers = allocator_->buffers(stream);\n+\n+\tcaptureCount_ = 0;\n+\tcaptureLimit_ = buffers.size();\n+\n+\tstd::vector> requests;\n+\tqueueRequests(stream, requests, buffers);\n+\n+\trunCaptureSession();\n+\n+\tASSERT_EQ(captureCount_, captureLimit_);\n+}\n+\n+void SimpleCaptureOverflow::requestComplete([[maybe_unused]] Request *request)\n+{\n+\tcaptureCompleted();\n+}\ndiff --git a/src/lc-compliance/simple_capture.h b/src/lc-compliance/simple_capture.h\nindex 4356a849aa1b..a1bb594ddb01 100644\n--- a/src/lc-compliance/simple_capture.h\n+++ b/src/lc-compliance/simple_capture.h\n@@ -72,4 +72,15 @@ private:\n \tvoid requestComplete(libcamera::Request *request) override;\n };\n \n+class SimpleCaptureOverflow : public SimpleCapture\n+{\n+public:\n+\tSimpleCaptureOverflow(std::shared_ptr camera);\n+\n+\tvoid capture();\n+\n+private:\n+\tvoid requestComplete(libcamera::Request *request) override;\n+};\n+\n #endif /* __LC_COMPLIANCE_SIMPLE_CAPTURE_H__ */\n","prefixes":["libcamera-devel","v5","07/10"]}