[{"id":18137,"web_url":"https://patchwork.libcamera.org/comment/18137/","msgid":"","date":"2021-07-12T15:58:50","subject":"Re: [libcamera-devel] [PATCH 25/30] cam: Move session_ member\n\tvariable to a local variable in run() function","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> The session_ member of the CamApp class is only needed in the run()\n> function. Make it a local variable.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Kieran Bingham \n\n> ---\n> src/cam/main.cpp | 30 ++++++++++++++----------------\n> 1 file changed, 14 insertions(+), 16 deletions(-)\n> \n> diff --git a/src/cam/main.cpp b/src/cam/main.cpp\n> index 4fe0c4c368d1..380c14e02cf0 100644\n> --- a/src/cam/main.cpp\n> +++ b/src/cam/main.cpp\n> @@ -47,7 +47,6 @@ private:\n> \tOptionsParser::Options options_;\n> \n> \tstd::unique_ptr cm_;\n> -\tstd::unique_ptr session_;\n> \n> \tEventLoop loop_;\n> };\n> @@ -86,8 +85,6 @@ int CamApp::init(int argc, char **argv)\n> \n> void CamApp::cleanup()\n> {\n> -\tsession_.reset();\n> -\n> \tcm_->stop();\n> }\n> \n> @@ -172,6 +169,7 @@ void CamApp::captureDone()\n> \n> int CamApp::run()\n> {\n> +\tstd::unique_ptr session;\n> \tint ret;\n> \n> \tif (options_.isSet(OptList)) {\n> @@ -185,55 +183,55 @@ int CamApp::run()\n> \t}\n> \n> \tif (options_.isSet(OptCamera)) {\n> -\t\tsession_ = std::make_unique(cm_.get(), options_);\n> -\t\tif (!session_->isValid()) {\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\tstd::cout << \"Using camera \" << session->camera()->id()\n> \t\t\t << std::endl;\n> \n> -\t\tsession_->captureDone.connect(this, &CamApp::captureDone);\n> +\t\tsession->captureDone.connect(this, &CamApp::captureDone);\n> \t}\n> \n> \tif (options_.isSet(OptListControls)) {\n> -\t\tif (!session_) {\n> +\t\tif (!session) {\n> \t\t\tstd::cout << \"Cannot list controls 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\tsession->listControls();\n> \t}\n> \n> \tif (options_.isSet(OptListProperties)) {\n> -\t\tif (!session_) {\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\tsession->listProperties();\n> \t}\n> \n> \tif (options_.isSet(OptInfo)) {\n> -\t\tif (!session_) {\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\tsession->infoConfiguration();\n> \t}\n> \n> \tif (options_.isSet(OptCapture)) {\n> -\t\tif (!session_) {\n> +\t\tif (!session) {\n> \t\t\tstd::cout << \"Can't capture without a camera\" << std::endl;\n> \t\t\treturn -ENODEV;\n> \t\t}\n> \n> -\t\tret = session_->start(options_);\n> +\t\tret = session->start(options_);\n> \t\tif (ret) {\n> \t\t\tstd::cout << \"Failed to start camera session\" << std::endl;\n> \t\t\treturn ret;\n> @@ -241,7 +239,7 @@ int CamApp::run()\n> \n> \t\tloop_.exec();\n> \n> -\t\tsession_->stop();\n> +\t\tsession->stop();\n> \t\treturn 0;\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 A47B3C3225\n\tfor ;\n\tMon, 12 Jul 2021 15:58:55 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E756768524;\n\tMon, 12 Jul 2021 17:58:54 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 04B8868513\n\tfor ;\n\tMon, 12 Jul 2021 17:58:54 +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 8DC09CC;\n\tMon, 12 Jul 2021 17:58:53 +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=\"aLIY4Mib\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1626105533;\n\tbh=+T3KKFRmuP376o+2jQP+u9g5n1QTVEwIwR6L+Caei0c=;\n\th=Subject:To:References:From:Date:In-Reply-To:From;\n\tb=aLIY4Mibl5ko1ZbBxyBwHpVLRh4XrzTB2aPXZFDuCAU1OALB2Bf2I2x2NZ+ECIK4d\n\tVs6alQVSE2FyvHl9gXctqrUT00nwCiUDucfRQcahvlOLFF0GU65mkt7SLTyw7lpN84\n\t1h007qQmAp/8aiqYnXAUo2E9CGKfyLW6xbJjkgx8=","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210707021941.20804-1-laurent.pinchart@ideasonboard.com>\n\t<20210707021941.20804-26-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Message-ID":"","Date":"Mon, 12 Jul 2021 16:58:50 +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-26-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH 25/30] cam: Move session_ member\n\tvariable to a local variable in run() 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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]