{"id":18026,"url":"https://patchwork.libcamera.org/api/patches/18026/?format=json","web_url":"https://patchwork.libcamera.org/patch/18026/","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":"<20221216122939.256534-13-paul.elder@ideasonboard.com>","date":"2022-12-16T12:29:33","name":"[libcamera-devel,v9,12/18] lc-compliance: Move buffer allocation to separate function","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"2dfdb31941406701c8eca9a252b62136ffb16468","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/18026/mbox/","series":[{"id":3675,"url":"https://patchwork.libcamera.org/api/series/3675/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3675","date":"2022-12-16T12:29:21","name":"lc-compliance: Add test to queue more requests than hardware depth","version":9,"mbox":"https://patchwork.libcamera.org/series/3675/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/18026/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/18026/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 62E38C31E9\n\tfor ;\n\tFri, 16 Dec 2022 12:30:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 23AAA633AE;\n\tFri, 16 Dec 2022 13:30:25 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id ECD7C633A3\n\tfor ;\n\tFri, 16 Dec 2022 13:30:22 +0100 (CET)","from pyrite.tail37cf.ts.net (h175-177-042-159.catv02.itscom.jp\n\t[175.177.42.159])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8361DA31;\n\tFri, 16 Dec 2022 13:30:21 +0100 (CET)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1671193825;\n\tbh=0Ty1h03QfLcxojEN+CbLhHIvt/SjBcyEsZ0W/uCgrXs=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=k75Idlki8MsdhBwYgOS95vPP0AL/ldPW5v2c/kdqEbPRn30QAzlxIb6md/Zlg4iT9\n\td+Pi6PXiwXriqpyuNT5WXpMaPL6auI9voS5k+UDZuX2fDWviY28ofRaI9z03A+dsfT\n\t7lPW1GOhxYk4Zr36qm+q1cKijAPPDRX0no1qATt18tz8BgbvfSXQ90FPWCdQatJ62F\n\t3naWwtK0q2bAWLdjsayOAM1inz//xRkegDW9hT+bJVYt3lqIENB4OSI2Uo9idnQWa7\n\t20R+xn9z9MypxSxRqL3WQzoYS1Iuom2R2K8+Q10kY+u9kATbNL1BkTExAKeZL8KRtj\n\tC0XzftGsbwGgg==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1671193822;\n\tbh=0Ty1h03QfLcxojEN+CbLhHIvt/SjBcyEsZ0W/uCgrXs=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=roU6xCpSa43zNDirhoWadzjVKra42t+f7A/3SXlONZ+mkprDpxxK+ALp5agb0m1wn\n\tMJufmp7fxgpBoPfq2BOBeOGwO7w63hqpEueq2YM+hGxaEEocX7MX/83CvGF7err2BZ\n\t4dbSFTROF4k8LOJIJY4g7fGX+GMOkrrapqTsYP0k="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"roU6xCpS\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 16 Dec 2022 21:29:33 +0900","Message-Id":"<20221216122939.256534-13-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.35.1","In-Reply-To":"<20221216122939.256534-1-paul.elder@ideasonboard.com>","References":"<20221216122939.256534-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v9 12/18] 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","From":"Paul Elder via libcamera-devel ","Reply-To":"Paul Elder ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Nícolas F. R. A. Prado \n\nMove 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 \nReviewed-by: Paul Elder \nSigned-off-by: Paul Elder \n\n---\nChanges in v9:\n- rebased\n\nChanges in v8:\n- Made SimpleCapture::allocateBuffers() a single function with an optional parameter\n\nChanges in v5:\n- New\n---\n src/apps/lc-compliance/capture_test.cpp | 8 +++++++-\n src/apps/lc-compliance/simple_capture.cpp | 16 ++++++++++------\n src/apps/lc-compliance/simple_capture.h | 1 +\n 3 files changed, 18 insertions(+), 7 deletions(-)","diff":"diff --git a/src/apps/lc-compliance/capture_test.cpp b/src/apps/lc-compliance/capture_test.cpp\nindex 1dcfcf92..923395cf 100644\n--- a/src/apps/lc-compliance/capture_test.cpp\n+++ b/src/apps/lc-compliance/capture_test.cpp\n@@ -87,6 +87,8 @@ TEST_P(SingleStream, Capture)\n \n \tcapture.configure(role);\n \n+\tcapture.allocateBuffers();\n+\n \tcapture.capture(numRequests);\n }\n \n@@ -106,8 +108,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@@ -125,6 +129,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/apps/lc-compliance/simple_capture.cpp b/src/apps/lc-compliance/simple_capture.cpp\nindex be495986..1e3e816a 100644\n--- a/src/apps/lc-compliance/simple_capture.cpp\n+++ b/src/apps/lc-compliance/simple_capture.cpp\n@@ -44,16 +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 =\n-\t\tcamera_->properties().get(properties::MinimumRequests).value();\n+\tif (!count)\n+\t\tcount = camera_->properties().get(properties::MinimumRequests).value();\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/apps/lc-compliance/simple_capture.h b/src/apps/lc-compliance/simple_capture.h\nindex 2911d601..b3091547 100644\n--- a/src/apps/lc-compliance/simple_capture.h\n+++ b/src/apps/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","v9","12/18"]}