[{"id":18135,"web_url":"https://patchwork.libcamera.org/comment/18135/","msgid":"<996984e9-a07c-160e-3f90-ec3c90de03fe@ideasonboard.com>","date":"2021-07-12T15:53:42","subject":"Re: [libcamera-devel] [PATCH 23/30] cam: Move camera session\n\tcreation and monitoring setup to run()","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"On 07/07/2021 03:19, Laurent Pinchart wrote:\n> Move creationg of the camera session and setup of the hotplug monitoring\n\ns/creationg/creation/\n\n> from the init() function to the run() function, to group all the code\n> that performs operations based on command line options in a single\n> place. The cleanup() call on session creation failure isn't required\n> anymore, as the cleanup() function is called unconditionally open return\n\ns/open/upon/\n\n> from run().\n> \n> This change allows merging two different code blocks related to hotplug\n> monitoring.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Kieran Bingham \n\n> ---\n> src/cam/main.cpp | 38 ++++++++++++++++++--------------------\n> 1 file changed, 18 insertions(+), 20 deletions(-)\n> \n> diff --git a/src/cam/main.cpp b/src/cam/main.cpp\n> index 03e62f305f24..cba0793ac39b 100644\n> --- a/src/cam/main.cpp\n> +++ b/src/cam/main.cpp\n> @@ -84,26 +84,6 @@ int CamApp::init(int argc, char **argv)\n> \t\treturn ret;\n> \t}\n> \n> -\tif (options_.isSet(OptCamera)) {\n> -\t\tsession_ = std::make_unique(cm_.get(), options_);\n> -\t\tif (!session_->isValid()) {\n> -\t\t\tstd::cout << \"Failed to create camera session\" << std::endl;\n> -\t\t\tcleanup();\n> -\t\t\treturn -EINVAL;\n> -\t\t}\n> -\n> -\t\tstd::cout << \"Using camera \" << session_->camera()->id()\n> -\t\t\t << std::endl;\n> -\n> -\t\tsession_->captureDone.connect(this, &CamApp::captureDone);\n> -\t}\n> -\n> -\tif (options_.isSet(OptMonitor)) {\n> -\t\tcm_->cameraAdded.connect(this, &CamApp::cameraAdded);\n> -\t\tcm_->cameraRemoved.connect(this, &CamApp::cameraRemoved);\n> -\t\tstd::cout << \"Monitoring new hotplug and unplug events\" << std::endl;\n> -\t}\n> -\n> \treturn 0;\n> }\n> \n> @@ -275,6 +255,19 @@ int CamApp::run()\n> \t\t}\n> \t}\n> \n> +\tif (options_.isSet(OptCamera)) {\n> +\t\tsession_ = std::make_unique(cm_.get(), options_);\n> +\t\tif (!session_->isValid()) {\n> +\t\t\tstd::cout << \"Failed to create camera session\" << std::endl;\n> +\t\t\treturn -EINVAL;\n> +\t\t}\n> +\n> +\t\tstd::cout << \"Using camera \" << session_->camera()->id()\n> +\t\t\t << std::endl;\n> +\n> +\t\tsession_->captureDone.connect(this, &CamApp::captureDone);\n> +\t}\n> +\n> \tif (options_.isSet(OptListControls)) {\n> \t\tret = listControls();\n> \t\tif (ret)\n> @@ -312,7 +305,12 @@ int CamApp::run()\n> \t}\n> \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> +\n> +\t\tcm_->cameraAdded.connect(this, &CamApp::cameraAdded);\n> +\t\tcm_->cameraRemoved.connect(this, &CamApp::cameraRemoved);\n> +\n> \t\tloop_.exec();\n> \t}\n> \n>","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 4CBBCC3226\n\tfor ;\n\tMon, 12 Jul 2021 15:53:48 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 95E2468524;\n\tMon, 12 Jul 2021 17:53:47 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2E58E68513\n\tfor ;\n\tMon, 12 Jul 2021 17:53:46 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B7AE9CC;\n\tMon, 12 Jul 2021 17:53:45 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"UeLkx2+H\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1626105225;\n\tbh=iJqXBFcEw6XtVR0ucITYV8BU/ryq25fa13P0zuKosE4=;\n\th=Subject:To:References:From:Date:In-Reply-To:From;\n\tb=UeLkx2+HurEyrWA8QTWHqC36atgzT5htHLhUVCVa5Ik0+FHWlk4Mq8yXmfh2spcH1\n\tO3WSCOZnnIoNIDUdd6mu0fW9wFCHGcNts6Fl1zGotb8XR/WN7eu/duHKiwrHKsgBD2\n\tCao6M8WkB5N+vmgeKE4APJhTu2EImMxJx1WAxQGI=","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210707021941.20804-1-laurent.pinchart@ideasonboard.com>\n\t<20210707021941.20804-24-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Message-ID":"<996984e9-a07c-160e-3f90-ec3c90de03fe@ideasonboard.com>","Date":"Mon, 12 Jul 2021 16:53:42 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.11.0","MIME-Version":"1.0","In-Reply-To":"<20210707021941.20804-24-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH 23/30] cam: Move camera session\n\tcreation and monitoring setup to run()","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\" "}}]