[{"id":18129,"web_url":"https://patchwork.libcamera.org/comment/18129/","msgid":"<0b9992aa-a9f6-e6e1-938c-342adf6079ed@ideasonboard.com>","date":"2021-07-12T15:33:45","subject":"Re: [libcamera-devel] [PATCH 17/30] cam: Store camera session\n\tpointer in CamApp class","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 the local CameraSession variable from the CamApp::run() function to\n> a member variable of the CamApp class, created in CamApp::init(). This\n> is a first step towards moving code to the CameraSession class.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Kieran Bingham \n\n> ---\n> src/cam/camera_session.cpp | 5 -----\n> src/cam/main.cpp | 16 ++++++++++++----\n> 2 files changed, 12 insertions(+), 9 deletions(-)\n> \n> diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\n> index 1fb7c1b6ad5d..7bb75e86eab5 100644\n> --- a/src/cam/camera_session.cpp\n> +++ b/src/cam/camera_session.cpp\n> @@ -34,11 +34,6 @@ int CameraSession::start(const OptionsParser::Options &options)\n> \tcaptureLimit_ = options[OptCapture].toInteger();\n> \tprintMetadata_ = options.isSet(OptMetadata);\n> \n> -\tif (!camera_) {\n> -\t\tstd::cout << \"Can't capture without a camera\" << std::endl;\n> -\t\treturn -ENODEV;\n> -\t}\n> -\n> \tret = camera_->configure(config_);\n> \tif (ret < 0) {\n> \t\tstd::cout << \"Failed to configure camera\" << std::endl;\n> diff --git a/src/cam/main.cpp b/src/cam/main.cpp\n> index b13230c374ad..2c6500a5682b 100644\n> --- a/src/cam/main.cpp\n> +++ b/src/cam/main.cpp\n> @@ -51,8 +51,11 @@ private:\n> \tstatic CamApp *app_;\n> \tOptionsParser::Options options_;\n> \tCameraManager *cm_;\n> +\n> \tstd::shared_ptr camera_;\n> \tstd::unique_ptr config_;\n> +\tstd::unique_ptr session_;\n> +\n> \tEventLoop loop_;\n> \n> \tbool strictFormats_;\n> @@ -127,6 +130,9 @@ int CamApp::init(int argc, char **argv)\n> \t\t\tcleanup();\n> \t\t\treturn ret;\n> \t\t}\n> +\n> +\t\tsession_ = std::make_unique(camera_, config_.get());\n> +\t\tsession_->captureDone.connect(this, &CamApp::captureDone);\n> \t}\n> \n> \tif (options_.isSet(OptMonitor)) {\n> @@ -369,10 +375,12 @@ int CamApp::run()\n> \t}\n> \n> \tif (options_.isSet(OptCapture)) {\n> -\t\tCameraSession session(camera_, config_.get());\n> -\t\tsession.captureDone.connect(this, &CamApp::captureDone);\n> +\t\tif (!camera_) {\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> @@ -380,7 +388,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 D2C15C3226\n\tfor ;\n\tMon, 12 Jul 2021 15:33:49 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 574EB68513;\n\tMon, 12 Jul 2021 17:33:49 +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 4DD8568513\n\tfor ;\n\tMon, 12 Jul 2021 17:33:48 +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 CAAB4CC;\n\tMon, 12 Jul 2021 17:33:47 +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=\"iSejIARD\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1626104027;\n\tbh=OEJA8EUCN83dP3nwMKcSbU/WtRaqXVi3PilIB6D66so=;\n\th=To:References:From:Subject:Date:In-Reply-To:From;\n\tb=iSejIARDcA0kA5TiOXy/ZhZr9mF2Q9XnszlRQm3jJjmx9InNbW+HGJRy0p1+SXvSt\n\t3NScMlF67NY4Dp+6+HNRylHnFHYfNcsVvqg2ZV4Ayv/agxpcrmSkVugaZiuDZ+AWCp\n\t/ibgXxh4V/rd1/6i+bkrOuV8mjGA2QPd3JRoeio8=","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210707021941.20804-1-laurent.pinchart@ideasonboard.com>\n\t<20210707021941.20804-18-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Message-ID":"<0b9992aa-a9f6-e6e1-938c-342adf6079ed@ideasonboard.com>","Date":"Mon, 12 Jul 2021 16:33:45 +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-18-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH 17/30] cam: Store camera session\n\tpointer in CamApp class","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\" "}}]