{"id":8967,"url":"https://patchwork.libcamera.org/api/1.1/patches/8967/?format=json","web_url":"https://patchwork.libcamera.org/patch/8967/","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":"<20200724134320.637696-4-niklas.soderlund@ragnatech.se>","date":"2020-07-24T13:43:20","name":"[libcamera-devel,3/3] cam: Add option to exit capture loop after n frames","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"2718b63bef82173ab6606badcd2b6e9cd3a8aecc","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/1.1/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8967/mbox/","series":[{"id":1136,"url":"https://patchwork.libcamera.org/api/1.1/series/1136/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1136","date":"2020-07-24T13:43:17","name":"cam: Add options to make batch testing with cam easier","version":1,"mbox":"https://patchwork.libcamera.org/series/1136/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8967/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8967/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 0E08DBD86F\n\tfor ;\n\tFri, 24 Jul 2020 13:43:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DB3D361212;\n\tFri, 24 Jul 2020 15:43:35 +0200 (CEST)","from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5176561244\n\tfor ;\n\tFri, 24 Jul 2020 15:43:32 +0200 (CEST)","from bismarck.berto.se (p4fca2eca.dip0.t-ipconnect.de\n\t[79.202.46.202]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid a8d8c379-cdb3-11ea-8fb8-005056917f90;\n\tFri, 24 Jul 2020 15:43:31 +0200 (CEST)"],"X-Halon-ID":"a8d8c379-cdb3-11ea-8fb8-005056917f90","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 24 Jul 2020 15:43:20 +0200","Message-Id":"<20200724134320.637696-4-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200724134320.637696-1-niklas.soderlund@ragnatech.se>","References":"<20200724134320.637696-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 3/3] cam: Add option to exit capture loop\n\tafter n frames","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","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add an option '--count' to specify how many frames to capture before\nterminating the capture loop.\n\nSigned-off-by: Niklas Söderlund \n---\n src/cam/capture.cpp | 17 +++++++++++++++--\n src/cam/capture.h | 2 ++\n src/cam/main.cpp | 2 ++\n src/cam/main.h | 1 +\n 4 files changed, 20 insertions(+), 2 deletions(-)","diff":"diff --git a/src/cam/capture.cpp b/src/cam/capture.cpp\nindex aa53c407d7b71b44..3ca70d9c6a8c7b7e 100644\n--- a/src/cam/capture.cpp\n+++ b/src/cam/capture.cpp\n@@ -17,7 +17,8 @@\n using namespace libcamera;\n \n Capture::Capture(std::shared_ptr camera, CameraConfiguration *config)\n-\t: camera_(camera), config_(config), writer_(nullptr), loop_(nullptr)\n+\t: camera_(camera), config_(config), writer_(nullptr), loop_(nullptr),\n+\t captureCount_(0), captureLimit_(0)\n {\n }\n \n@@ -26,6 +27,8 @@ int Capture::run(EventLoop *loop, const OptionsParser::Options &options)\n \tint ret;\n \n \tloop_ = loop;\n+\tcaptureCount_ = 0;\n+\tcaptureLimit_ = options.isSet(OptCount) ? options[OptCount].toInteger() : 0;\n \n \tif (!camera_) {\n \t\tstd::cout << \"Can't capture without a camera\" << std::endl;\n@@ -133,7 +136,11 @@ int Capture::capture(FrameBufferAllocator *allocator)\n \t\t}\n \t}\n \n-\tstd::cout << \"Capture until user interrupts by SIGINT\" << std::endl;\n+\tif (captureLimit_)\n+\t\tstd::cout << \"Capture \" << captureLimit_ << \" frames\" << std::endl;\n+\telse\n+\t\tstd::cout << \"Capture until user interrupts by SIGINT\" << std::endl;\n+\n \tret = loop_->exec();\n \tif (ret)\n \t\tstd::cout << \"Failed to run capture loop\" << std::endl;\n@@ -202,5 +209,11 @@ void Capture::requestComplete(Request *request)\n \t\trequest->addBuffer(stream, buffer);\n \t}\n \n+\tcaptureCount_++;\n+\tif (captureLimit_ && captureCount_ >= captureLimit_) {\n+\t\tloop_->exit(0);\n+\t\treturn;\n+\t}\n+\n \tcamera_->queueRequest(request);\n }\ndiff --git a/src/cam/capture.h b/src/cam/capture.h\nindex 67c6260bfe24aefc..0a1cbc519f2a90c5 100644\n--- a/src/cam/capture.h\n+++ b/src/cam/capture.h\n@@ -40,6 +40,8 @@ private:\n \tstd::chrono::steady_clock::time_point last_;\n \n \tEventLoop *loop_;\n+\tunsigned int captureCount_;\n+\tunsigned int captureLimit_;\n };\n \n #endif /* __CAM_CAPTURE_H__ */\ndiff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex a223563ad37e9fe5..f3bacb4a895600ee 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -188,6 +188,8 @@ int CamApp::parseOptions(int argc, char *argv[])\n \tparser.addOption(OptStrictFormats, OptionNone,\n \t\t\t \"Do not allow requested stream format(s) to be adjusted\",\n \t\t\t \"strict-formats\");\n+\tparser.addOption(OptCount, OptionInteger, \"Number of frames to capture\",\n+\t\t\t \"count\", ArgumentRequired, \"count\");\n \n \toptions_ = parser.parse(argc, argv);\n \tif (!options_.valid())\ndiff --git a/src/cam/main.h b/src/cam/main.h\nindex 6f95add31a6341cf..d4c93fee35681e86 100644\n--- a/src/cam/main.h\n+++ b/src/cam/main.h\n@@ -18,6 +18,7 @@ enum {\n \tOptStream = 's',\n \tOptListControls = 256,\n \tOptStrictFormats = 257,\n+\tOptCount = 258,\n };\n \n #endif /* __CAM_MAIN_H__ */\n","prefixes":["libcamera-devel","3/3"]}