{"id":13473,"url":"https://patchwork.libcamera.org/api/patches/13473/?format=json","web_url":"https://patchwork.libcamera.org/patch/13473/","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":"<20210824195636.1110845-12-nfraprado@collabora.com>","date":"2021-08-24T19:56:30","name":"[libcamera-devel,v8,11/17] lc-compliance: Move buffer allocation to separate function","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"adb8ed89b0861f4e3c2c8ac4731aa5c45938f42d","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/13473/mbox/","series":[{"id":2389,"url":"https://patchwork.libcamera.org/api/series/2389/?format=json","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/13473/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13473/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 7032EC324C\n\tfor ;\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 A4907688A5;\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 C7CF26891A\n\tfor ;\n\tTue, 24 Aug 2021 21:57:37 +0200 (CEST)","from [127.0.0.1] (localhost [127.0.0.1])\n\t(Authenticated sender: nfraprado) with ESMTPSA id 6C7041F43379"],"From":"=?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 24 Aug 2021 16:56:30 -0300","Message-Id":"<20210824195636.1110845-12-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 11/17] lc-compliance: Move buffer\n\tallocation to separate function","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":"Move buffer allocation to its own function and with an optional count\nargument so tests can specify how many buffers to allocate. When count\nis omitted, allocate MinimumRequests buffers.\n\nSigned-off-by: Nícolas F. R. A. Prado \n\n---\n\nChanges in v8:\n- Made SimpleCapture::allocateBuffers() a single function with an optional parameter\n\nChanges in v5:\n- New\n\n src/lc-compliance/capture_test.cpp | 8 +++++++-\n src/lc-compliance/simple_capture.cpp | 15 ++++++++++-----\n src/lc-compliance/simple_capture.h | 1 +\n 3 files changed, 18 insertions(+), 6 deletions(-)","diff":"diff --git a/src/lc-compliance/capture_test.cpp b/src/lc-compliance/capture_test.cpp\nindex 52578207c11f..6439cbd88f8e 100644\n--- a/src/lc-compliance/capture_test.cpp\n+++ b/src/lc-compliance/capture_test.cpp\n@@ -80,6 +80,8 @@ TEST_P(SingleStream, Capture)\n \n \tcapture.configure(role);\n \n+\tcapture.allocateBuffers();\n+\n \tcapture.capture(numRequests);\n }\n \n@@ -99,8 +101,10 @@ TEST_P(SingleStream, CaptureStartStop)\n \n \tcapture.configure(role);\n \n-\tfor (unsigned int starts = 0; starts < numRepeats; starts++)\n+\tfor (unsigned int starts = 0; starts < numRepeats; starts++) {\n+\t\tcapture.allocateBuffers();\n \t\tcapture.capture(numRequests);\n+\t}\n }\n \n /*\n@@ -118,6 +122,8 @@ TEST_P(SingleStream, UnbalancedStop)\n \n \tcapture.configure(role);\n \n+\tcapture.allocateBuffers();\n+\n \tcapture.capture(numRequests);\n }\n \ndiff --git a/src/lc-compliance/simple_capture.cpp b/src/lc-compliance/simple_capture.cpp\nindex d87f30cbeb1b..041a2a4cbb5a 100644\n--- a/src/lc-compliance/simple_capture.cpp\n+++ b/src/lc-compliance/simple_capture.cpp\n@@ -44,15 +44,20 @@ void SimpleCapture::configure(StreamRole role)\n \t}\n }\n \n-void SimpleCapture::start()\n+void SimpleCapture::allocateBuffers(unsigned int count)\n {\n-\tunsigned int bufferCount = camera_->properties().get(properties::MinimumRequests);\n+\tif (!count)\n+\t\tcount = camera_->properties().get(properties::MinimumRequests);\n+\n \tStream *stream = config_->at(0).stream();\n-\tint count = allocator_->allocate(stream, bufferCount);\n+\tint allocatedCount = allocator_->allocate(stream, count);\n \n-\tASSERT_GE(count, 0) << \"Failed to allocate buffers\";\n-\tEXPECT_EQ(count, bufferCount) << \"Allocated less buffers than expected\";\n+\tASSERT_GE(allocatedCount, 0) << \"Failed to allocate buffers\";\n+\tEXPECT_EQ(allocatedCount, count) << \"Allocated less buffers than expected\";\n+}\n \n+void SimpleCapture::start()\n+{\n \tcamera_->requestCompleted.connect(this, &SimpleCapture::requestComplete);\n \n \tASSERT_EQ(camera_->start(), 0) << \"Failed to start camera\";\ndiff --git a/src/lc-compliance/simple_capture.h b/src/lc-compliance/simple_capture.h\nindex 100ffd6637ad..401ba8273da8 100644\n--- a/src/lc-compliance/simple_capture.h\n+++ b/src/lc-compliance/simple_capture.h\n@@ -17,6 +17,7 @@ class SimpleCapture\n {\n public:\n \tvoid configure(libcamera::StreamRole role);\n+\tvoid allocateBuffers(unsigned int count = 0);\n \n protected:\n \tSimpleCapture(std::shared_ptr camera);\n","prefixes":["libcamera-devel","v8","11/17"]}