{"id":13077,"url":"https://patchwork.libcamera.org/api/patches/13077/?format=json","web_url":"https://patchwork.libcamera.org/patch/13077/","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-4-nfraprado@collabora.com>","date":"2021-07-22T23:28:43","name":"[libcamera-devel,v7,03/11] lc-compliance: Move buffer allocation to separate function","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"05721755c20aef51c2d19d7ecd53b2719c4ed1d0","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/13077/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/13077/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13077/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 48733C0109\n\tfor ;\n\tThu, 22 Jul 2021 23:29:32 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 17EF7687A6;\n\tFri, 23 Jul 2021 01:29:32 +0200 (CEST)","from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 44AF26877B\n\tfor ;\n\tFri, 23 Jul 2021 01:29:30 +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 7AB1B1F447DD;\n\tFri, 23 Jul 2021 00:29:28 +0100 (BST)"],"From":"=?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 22 Jul 2021 20:28:43 -0300","Message-Id":"<20210722232851.747614-4-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 03/11] 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 a count argument so\ntests can specify how many buffers to allocate.\n\nAlso add an overloaded function with no arguments and that allocates\nMinNumRequests buffers for easier use by current tests.\n\nSigned-off-by: Nícolas F. R. A. Prado \n---\n\nNo changes in v7\n\nNo changes in v6\n\nAdded in v5\n\n src/lc-compliance/capture_test.cpp | 8 +++++++-\n src/lc-compliance/simple_capture.cpp | 15 +++++++++++----\n src/lc-compliance/simple_capture.h | 2 ++\n 3 files changed, 20 insertions(+), 5 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 6444203547be..8683d9050806 100644\n--- a/src/lc-compliance/simple_capture.cpp\n+++ b/src/lc-compliance/simple_capture.cpp\n@@ -44,15 +44,22 @@ void SimpleCapture::configure(StreamRole role)\n \t}\n }\n \n-void SimpleCapture::start()\n+void SimpleCapture::allocateBuffers()\n+{\n+\tallocateBuffers(camera_->properties().get(properties::MinimumRequests));\n+}\n+\n+void SimpleCapture::allocateBuffers(unsigned int count)\n {\n-\tunsigned int bufferCount = camera_->properties().get(properties::MinNumRequests);\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(static_cast(count), bufferCount) << \"Allocated less buffers than expected\";\n+\tEXPECT_EQ(static_cast(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..1a1e874a528c 100644\n--- a/src/lc-compliance/simple_capture.h\n+++ b/src/lc-compliance/simple_capture.h\n@@ -17,6 +17,8 @@ class SimpleCapture\n {\n public:\n \tvoid configure(libcamera::StreamRole role);\n+\tvoid allocateBuffers();\n+\tvoid allocateBuffers(unsigned int count);\n \n protected:\n \tSimpleCapture(std::shared_ptr camera);\n","prefixes":["libcamera-devel","v7","03/11"]}