[{"id":18126,"web_url":"https://patchwork.libcamera.org/comment/18126/","msgid":"<5fd8753d-cf9c-5bdc-4aca-f0c199eedd9e@ideasonboard.com>","date":"2021-07-12T15:17:00","subject":"Re: [libcamera-devel] [PATCH 14/30] cam: Move event loop exit from\n\tCameraSession to CamApp","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> MAke exiting the event loop the responsibility of the application, not\n\n/MAke/Make/\n\n> the camera session, to prepare for support of multiple camera sessions.\n> \n> Signed-off-by: Laurent Pinchart \n> ---\n> src/cam/camera_session.cpp | 2 +-\n> src/cam/camera_session.h | 4 ++++\n> src/cam/main.cpp | 7 +++++++\n> 3 files changed, 12 insertions(+), 1 deletion(-)\n> \n> diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\n> index b26c7974056d..16c1c66a285a 100644\n> --- a/src/cam/camera_session.cpp\n> +++ b/src/cam/camera_session.cpp\n> @@ -232,7 +232,7 @@ void CameraSession::processRequest(Request *request)\n> \n> \tcaptureCount_++;\n> \tif (captureLimit_ && captureCount_ >= captureLimit_) {\n> -\t\tEventLoop::instance()->exit(0);\n> +\t\tcaptureDone.emit();\n> \t\treturn;\n> \t}\n> \n> diff --git a/src/cam/camera_session.h b/src/cam/camera_session.h\n> index 270ba3e929e7..2728d7607db2 100644\n> --- a/src/cam/camera_session.h\n> +++ b/src/cam/camera_session.h\n> @@ -11,6 +11,8 @@\n> #include \n> #include \n> \n> +#include \n> +\n> #include \n> #include \n> #include \n> @@ -28,6 +30,8 @@ public:\n> \n> \tint run(const OptionsParser::Options &options);\n> \n> +\tlibcamera::Signal<> captureDone;\n> +\n> private:\n> \tint capture(libcamera::FrameBufferAllocator *allocator);\n> \n> diff --git a/src/cam/main.cpp b/src/cam/main.cpp\n> index 90435206d386..a567a7cc7653 100644\n> --- a/src/cam/main.cpp\n> +++ b/src/cam/main.cpp\n> @@ -38,6 +38,7 @@ public:\n> private:\n> \tvoid cameraAdded(std::shared_ptr cam);\n> \tvoid cameraRemoved(std::shared_ptr cam);\n> +\tvoid captureDone();\n> \tint parseOptions(int argc, char *argv[]);\n> \tint prepareConfig();\n> \tint listControls();\n> @@ -330,6 +331,11 @@ void CamApp::cameraRemoved(std::shared_ptr cam)\n> \tstd::cout << \"Camera Removed: \" << cam->id() << std::endl;\n> }\n> \n> +void CamApp::captureDone()\n> +{\n> +\tEventLoop::instance()->exit(0);\n\nOk - this makes more sense than the previous patch ;-)\n\nI'm curious that now any CaptureSession can signal application to close\n- so perhaps we'll see that change in the next patches...\n\nReviewed-by: Kieran Bingham \n\n> +}\n> +\n> int CamApp::run()\n> {\n> \tint ret;\n> @@ -364,6 +370,7 @@ int CamApp::run()\n> \n> \tif (options_.isSet(OptCapture)) {\n> \t\tCameraSession session(camera_, config_.get());\n> +\t\tsession.captureDone.connect(this, &CamApp::captureDone);\n> \t\treturn session.run(options_);\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 83534C3225\n\tfor ;\n\tMon, 12 Jul 2021 15:17:04 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9502568524;\n\tMon, 12 Jul 2021 17:17:03 +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 DFF6068513\n\tfor ;\n\tMon, 12 Jul 2021 17:17:02 +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 6A9B9CC;\n\tMon, 12 Jul 2021 17:17:02 +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=\"hV7CarFZ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1626103022;\n\tbh=cBTXj8v/JEIA7Ga6tHQkeqSLPW7OsHKoeCxwuN+1RlE=;\n\th=Subject:To:References:From:Date:In-Reply-To:From;\n\tb=hV7CarFZsH7PRcYGbY/bPDrxUHC0Rrf4Esyb9lN0yf894rlu93Uh6eNTi99of+szw\n\tocvolQAJNHilMHFOzoGrXCTMFKDVP+E7smIzaK1s4+kfSGWiHnMt9XEoaj48zkD+Y1\n\tDvUJv+XF+UITDfTY9MIU5Se1HpyXosUJNixpH87k=","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210707021941.20804-1-laurent.pinchart@ideasonboard.com>\n\t<20210707021941.20804-15-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Message-ID":"<5fd8753d-cf9c-5bdc-4aca-f0c199eedd9e@ideasonboard.com>","Date":"Mon, 12 Jul 2021 16:17:00 +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-15-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH 14/30] cam: Move event loop exit from\n\tCameraSession to CamApp","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\" "}}]