{"id":12939,"url":"https://patchwork.libcamera.org/api/patches/12939/?format=json","web_url":"https://patchwork.libcamera.org/patch/12939/","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":"<20210712215645.30478-27-laurent.pinchart@ideasonboard.com>","date":"2021-07-12T21:56:41","name":"[libcamera-devel,v2,26/30] cam: Reorganize run() function and merge the two event loops","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"acf759d8b0e62cb0a59f14b6695c78f4390e9a43","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12939/mbox/","series":[{"id":2229,"url":"https://patchwork.libcamera.org/api/series/2229/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2229","date":"2021-07-12T21:56:15","name":"Multi-camera support in the cam application","version":2,"mbox":"https://patchwork.libcamera.org/series/2229/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12939/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12939/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 DEC72C3228\n\tfor ;\n\tMon, 12 Jul 2021 21:57:58 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7780D6853C;\n\tMon, 12 Jul 2021 23:57:58 +0200 (CEST)","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 8F2D96853B\n\tfor ;\n\tMon, 12 Jul 2021 23:57:44 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2EDCA56B\n\tfor ;\n\tMon, 12 Jul 2021 23:57:44 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"LQHZrTe/\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1626127064;\n\tbh=hQPmp3148aQvFoWcHfvQGluM84QoY7DMKKMP68IFNpw=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=LQHZrTe/DTjty4mJN78bCSuOPmlCyi48f+P69FJOHhrdpnaq9oARLegxRYl3gjxvU\n\tfYbycqNd5GjsEKOJexnalQRqHBHuVQxjSR29iKaRJ/oUUAvU2EotbUHKVZHQiRGV9o\n\t2o1Lnvv1XxJlg4RMmi4DmLVYz8c21daylk16gCjc=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 13 Jul 2021 00:56:41 +0300","Message-Id":"<20210712215645.30478-27-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210712215645.30478-1-laurent.pinchart@ideasonboard.com>","References":"<20210712215645.30478-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 26/30] cam: Reorganize run() function\n\tand merge the two event loops","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Reorganize the run() function to make it more readable, and merge the\ntwo event loops into one as capture and hotplug monitoring don't have to\nbe mutually exclusive.\n\nSigned-off-by: Laurent Pinchart \nReviewed-by: Kieran Bingham \n---\n src/cam/main.cpp | 60 ++++++++++++++++++++++++------------------------\n 1 file changed, 30 insertions(+), 30 deletions(-)","diff":"diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 380c14e02cf0..a3f19d0fa61b 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -5,6 +5,7 @@\n * main.cpp - cam - The libcamera swiss army knife\n */\n \n+#include \n #include \n #include \n #include \n@@ -48,6 +49,7 @@ private:\n \n \tstd::unique_ptr cm_;\n \n+\tstd::atomic_uint loopUsers_;\n \tEventLoop loop_;\n };\n \n@@ -164,14 +166,15 @@ void CamApp::cameraRemoved(std::shared_ptr cam)\n \n void CamApp::captureDone()\n {\n-\tEventLoop::instance()->exit(0);\n+\tif (--loopUsers_ == 0)\n+\t\tEventLoop::instance()->exit(0);\n }\n \n int CamApp::run()\n {\n-\tstd::unique_ptr session;\n \tint ret;\n \n+\t/* 1. List all cameras. */\n \tif (options_.isSet(OptList)) {\n \t\tstd::cout << \"Available cameras:\" << std::endl;\n \n@@ -182,6 +185,9 @@ int CamApp::run()\n \t\t}\n \t}\n \n+\t/* 2. Create the camera session. */\n+\tstd::unique_ptr session;\n+\n \tif (options_.isSet(OptCamera)) {\n \t\tsession = std::make_unique(cm_.get(), options_);\n \t\tif (!session->isValid()) {\n@@ -195,36 +201,25 @@ int CamApp::run()\n \t\tsession->captureDone.connect(this, &CamApp::captureDone);\n \t}\n \n-\tif (options_.isSet(OptListControls)) {\n+\t/* 3. Print camera information. */\n+\tif (options_.isSet(OptListControls) ||\n+\t options_.isSet(OptListProperties) ||\n+\t options_.isSet(OptInfo)) {\n \t\tif (!session) {\n-\t\t\tstd::cout << \"Cannot list controls without a camera\"\n+\t\t\tstd::cout << \"Cannot print camera information without a camera\"\n \t\t\t\t << std::endl;\n \t\t\treturn -EINVAL;\n \t\t}\n \n-\t\tsession->listControls();\n-\t}\n-\n-\tif (options_.isSet(OptListProperties)) {\n-\t\tif (!session) {\n-\t\t\tstd::cout << \"Cannot list properties without a camera\"\n-\t\t\t\t << std::endl;\n-\t\t\treturn -EINVAL;\n-\t\t}\n-\n-\t\tsession->listProperties();\n-\t}\n-\n-\tif (options_.isSet(OptInfo)) {\n-\t\tif (!session) {\n-\t\t\tstd::cout << \"Cannot print stream information without a camera\"\n-\t\t\t\t << std::endl;\n-\t\t\treturn -EINVAL;\n-\t\t}\n-\n-\t\tsession->infoConfiguration();\n+\t\tif (options_.isSet(OptListControls))\n+\t\t\tsession->listControls();\n+\t\tif (options_.isSet(OptListProperties))\n+\t\t\tsession->listProperties();\n+\t\tif (options_.isSet(OptInfo))\n+\t\t\tsession->infoConfiguration();\n \t}\n \n+\t/* 4. Start capture. */\n \tif (options_.isSet(OptCapture)) {\n \t\tif (!session) {\n \t\t\tstd::cout << \"Can't capture without a camera\" << std::endl;\n@@ -237,12 +232,10 @@ int CamApp::run()\n \t\t\treturn ret;\n \t\t}\n \n-\t\tloop_.exec();\n-\n-\t\tsession->stop();\n-\t\treturn 0;\n+\t\tloopUsers_++;\n \t}\n \n+\t/* 5. Enable hotplug monitoring. */\n \tif (options_.isSet(OptMonitor)) {\n \t\tstd::cout << \"Monitoring new hotplug and unplug events\" << std::endl;\n \t\tstd::cout << \"Press Ctrl-C to interrupt\" << std::endl;\n@@ -250,9 +243,16 @@ int CamApp::run()\n \t\tcm_->cameraAdded.connect(this, &CamApp::cameraAdded);\n \t\tcm_->cameraRemoved.connect(this, &CamApp::cameraRemoved);\n \n-\t\tloop_.exec();\n+\t\tloopUsers_++;\n \t}\n \n+\tif (loopUsers_)\n+\t\tloop_.exec();\n+\n+\t/* 6. Stop capture. */\n+\tif (options_.isSet(OptCapture))\n+\t\tsession->stop();\n+\n \treturn 0;\n }\n \n","prefixes":["libcamera-devel","v2","26/30"]}