From patchwork Thu Jul 15 21:14:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 12988 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id D3C18C322B for ; Thu, 15 Jul 2021 21:15:23 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 8C47968562; Thu, 15 Jul 2021 23:15:22 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="iF+8PbMq"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 6D63868540 for ; Thu, 15 Jul 2021 23:15:10 +0200 (CEST) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 07F7B56B for ; Thu, 15 Jul 2021 23:15:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1626383710; bh=x5CNEx1LWA6WLUjHoyC1GgwLFypYWI48h97ycgU2hCc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=iF+8PbMqXc321BOb4o1FlgOnRlFfLq4HmgUbISi+1hBN/pMVPLPoIvrdMKpesgPpg xNX4o/My9Aa6vKUyoCQCE9FuVVHM51zCQBychDqeTXpfwa0wLndQFrfV3W3XyeHhGk stEoHXreYYRtkp25nyBbDOiJviIvb2dhJQlWZj6M= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Fri, 16 Jul 2021 00:14:43 +0300 Message-Id: <20210715211459.19373-18-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210715211459.19373-1-laurent.pinchart@ideasonboard.com> References: <20210715211459.19373-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 17/33] cam: Move event loop exit from CameraSession to CamApp X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Make exiting the event loop the responsibility of the application, not the camera session, to prepare for support of multiple camera sessions. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/cam/camera_session.cpp | 2 +- src/cam/camera_session.h | 4 ++++ src/cam/main.cpp | 7 +++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp index b26c7974056d..16c1c66a285a 100644 --- a/src/cam/camera_session.cpp +++ b/src/cam/camera_session.cpp @@ -232,7 +232,7 @@ void CameraSession::processRequest(Request *request) captureCount_++; if (captureLimit_ && captureCount_ >= captureLimit_) { - EventLoop::instance()->exit(0); + captureDone.emit(); return; } diff --git a/src/cam/camera_session.h b/src/cam/camera_session.h index 270ba3e929e7..2728d7607db2 100644 --- a/src/cam/camera_session.h +++ b/src/cam/camera_session.h @@ -11,6 +11,8 @@ #include #include +#include + #include #include #include @@ -28,6 +30,8 @@ public: int run(const OptionsParser::Options &options); + libcamera::Signal<> captureDone; + private: int capture(libcamera::FrameBufferAllocator *allocator); diff --git a/src/cam/main.cpp b/src/cam/main.cpp index 90435206d386..a567a7cc7653 100644 --- a/src/cam/main.cpp +++ b/src/cam/main.cpp @@ -38,6 +38,7 @@ public: private: void cameraAdded(std::shared_ptr cam); void cameraRemoved(std::shared_ptr cam); + void captureDone(); int parseOptions(int argc, char *argv[]); int prepareConfig(); int listControls(); @@ -330,6 +331,11 @@ void CamApp::cameraRemoved(std::shared_ptr cam) std::cout << "Camera Removed: " << cam->id() << std::endl; } +void CamApp::captureDone() +{ + EventLoop::instance()->exit(0); +} + int CamApp::run() { int ret; @@ -364,6 +370,7 @@ int CamApp::run() if (options_.isSet(OptCapture)) { CameraSession session(camera_, config_.get()); + session.captureDone.connect(this, &CamApp::captureDone); return session.run(options_); }