{"id":18070,"url":"https://patchwork.libcamera.org/api/1.1/patches/18070/?format=json","web_url":"https://patchwork.libcamera.org/patch/18070/","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":"<20221228223003.2265712-15-paul.elder@ideasonboard.com>","date":"2022-12-28T22:29:58","name":"[libcamera-devel,v10,14/19] lc-compliance: Factor common capture code into SimpleCapture","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"c84b2a11db57bc4a480d0ce8cc5ac94e1835b0ea","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/18070/mbox/","series":[{"id":3691,"url":"https://patchwork.libcamera.org/api/1.1/series/3691/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3691","date":"2022-12-28T22:29:44","name":"lc-compliance: Add test to queue more requests than hardware depth","version":10,"mbox":"https://patchwork.libcamera.org/series/3691/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/18070/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/18070/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 2F235C3220\n\tfor ;\n\tWed, 28 Dec 2022 22:30:42 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CE87462606;\n\tWed, 28 Dec 2022 23:30:41 +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 CD14A625ED\n\tfor ;\n\tWed, 28 Dec 2022 23:30:34 +0100 (CET)","from pyrite.mediacom.info (unknown\n\t[IPv6:2604:2d80:ad8a:9000:1bf9:855b:22de:3645])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id BCDB16D0;\n\tWed, 28 Dec 2022 23:30:33 +0100 (CET)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1672266641;\n\tbh=VPXe7AwBiDzM/pQmANFAF8RGe93JNSnljJB4v1hFYsg=;\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=W9YL0E9JTFZ0t5Uodbl/fN+qrXOI82dnLzIk5gFYgGXSwEL0WRFpHXf+HJ4gUuiwP\n\tS7NcmIf4cHbn8REpPi1ROKqmo1MCtMBOsWYn60oXx4IqKkKLFCqCBuJ3Me4wErBp1+\n\tkJbI2NrZIc/et9ZYICf9Cxp4qyzYfTvoabMJFTvWpqJkzxW0pplJ0jSXPilOEZoeaO\n\tTeRFmecAsSoE0gI8dgD2jJAJVbyTbxAk1/DXRnNcA50ioKZyH1kqPDOaljUjqQYVpX\n\t1LXb6Yxct9jsRCwSN+FE9QqB+s65lYrH8m/ILoQHcEV6wMsk6BAINhDN700U7uMjTf\n\tKwxdSZ188sNcQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1672266634;\n\tbh=VPXe7AwBiDzM/pQmANFAF8RGe93JNSnljJB4v1hFYsg=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=XbVOl7GmIH+rLzcz2b5ZNz1r5J9aRKcLjIwC24Z0Z5X99kK31HNlxewGTM6llnZP8\n\tNxdjn/0541nSXQEWWKzGBzdzz1T1uVZYrDF2xXyRxZ81bWmpHZvLzJReKWhQ25gXKQ\n\ta6WdvpT5RdjEOC8QBpPZSt5soSNXGL8uoRpRWKZM="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"XbVOl7Gm\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 28 Dec 2022 16:29:58 -0600","Message-Id":"<20221228223003.2265712-15-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.35.1","In-Reply-To":"<20221228223003.2265712-1-paul.elder@ideasonboard.com>","References":"<20221228223003.2265712-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v10 14/19] 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","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\nFactor 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 \nReviewed-by: Paul Elder \nSigned-off-by: Paul Elder \n\n---\nChanges in v9:\n- rebased\n\nChanges in v8:\n- Added requests_ member to SimpleCapture to hold ownership of queued\n requests during capture\n- Made queueRequest() virtual and removed SimpleCaptureBalanced::queueRequests()\n\nChanges in v6:\n- Switched queueRequests()'s 'buffers' and 'requests' parameters order, since\n 'requests' is an output variable\n- Added comment to runCaptureSession()\n- Added missing blank line before return in captureCompleted()\n- Added blank line to runCaptureSession()\n---\n src/apps/lc-compliance/simple_capture.cpp | 89 +++++++++++++----------\n src/apps/lc-compliance/simple_capture.h | 15 ++--\n 2 files changed, 58 insertions(+), 46 deletions(-)","diff":"diff --git a/src/apps/lc-compliance/simple_capture.cpp b/src/apps/lc-compliance/simple_capture.cpp\nindex 1e3e816a..6dd5c7af 100644\n--- a/src/apps/lc-compliance/simple_capture.cpp\n+++ b/src/apps/lc-compliance/simple_capture.cpp\n@@ -77,6 +77,49 @@ 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+\n+\treturn false;\n+}\n+\n+int SimpleCapture::queueRequest(Request *request)\n+{\n+\treturn camera_->queueRequest(request);\n+}\n+\n+void SimpleCapture::queueRequests(Stream *stream,\n+\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\tASSERT_TRUE(request) << \"Can't create request\";\n+\n+\t\tASSERT_EQ(request->addBuffer(stream, buffer.get()), 0) << \"Can't set buffer for request\";\n+\n+\t\tASSERT_EQ(queueRequest(request.get()), 0) << \"Failed to queue request\";\n+\n+\t\trequests_.push_back(std::move(request));\n+\t}\n+}\n+\n+int SimpleCapture::runCaptureSession()\n+{\n+\tloop_ = new EventLoop();\n+\tint status = loop_->exec();\n+\n+\t/* After session ended */\n+\tstop();\n+\tdelete loop_;\n+\n+\treturn status;\n+}\n+\n /* SimpleCaptureBalanced */\n \n SimpleCaptureBalanced::SimpleCaptureBalanced(std::shared_ptr camera)\n@@ -103,23 +146,9 @@ void SimpleCaptureBalanced::capture(unsigned int numRequests)\n \tcaptureCount_ = 0;\n \tcaptureLimit_ = numRequests;\n \n-\t/* Queue the recommended number of reqeuests. */\n-\tfor (const std::unique_ptr &buffer : buffers) {\n-\t\tstd::unique_ptr request = camera_->createRequest();\n-\t\tASSERT_TRUE(request) << \"Can't create request\";\n-\n-\t\tASSERT_EQ(request->addBuffer(stream, buffer.get()), 0) << \"Can't set buffer for request\";\n+\tqueueRequests(stream, buffers);\n \n-\t\tASSERT_EQ(queueRequest(request.get()), 0) << \"Failed to queue request\";\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 \tASSERT_EQ(captureCount_, captureLimit_);\n }\n@@ -135,11 +164,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@@ -163,34 +189,17 @@ void SimpleCaptureUnbalanced::capture(unsigned int numRequests)\n \tcaptureCount_ = 0;\n \tcaptureLimit_ = numRequests;\n \n-\t/* Queue the recommended number of reqeuests. */\n-\tfor (const std::unique_ptr &buffer : buffers) {\n-\t\tstd::unique_ptr request = camera_->createRequest();\n-\t\tASSERT_TRUE(request) << \"Can't create request\";\n-\n-\t\tASSERT_EQ(request->addBuffer(stream, buffer.get()), 0) << \"Can't set buffer for request\";\n+\tqueueRequests(stream, buffers);\n \n-\t\tASSERT_EQ(camera_->queueRequest(request.get()), 0) << \"Failed to queue request\";\n-\n-\t\trequests_.push_back(std::move(request));\n-\t}\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 \tASSERT_EQ(status, 0);\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/apps/lc-compliance/simple_capture.h b/src/apps/lc-compliance/simple_capture.h\nindex b3091547..89ecc71c 100644\n--- a/src/apps/lc-compliance/simple_capture.h\n+++ b/src/apps/lc-compliance/simple_capture.h\n@@ -25,11 +25,19 @@ protected:\n \n \tvoid start();\n \tvoid stop();\n+\tvirtual int queueRequest(libcamera::Request *request);\n+\tvoid queueRequests(libcamera::Stream *stream,\n+\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@@ -44,12 +52,10 @@ public:\n \tvoid capture(unsigned int numRequests);\n \n private:\n-\tint queueRequest(libcamera::Request *request);\n+\tint queueRequest(libcamera::Request *request) override;\n \tvoid requestComplete(libcamera::Request *request) override;\n \n \tunsigned int queueCount_;\n-\tunsigned int captureCount_;\n-\tunsigned int captureLimit_;\n };\n \n class SimpleCaptureUnbalanced : public SimpleCapture\n@@ -61,7 +67,4 @@ public:\n \n private:\n \tvoid requestComplete(libcamera::Request *request) override;\n-\n-\tunsigned int captureCount_;\n-\tunsigned int captureLimit_;\n };\n","prefixes":["libcamera-devel","v10","14/19"]}