From patchwork Fri Jul 24 19:18:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 8989 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 2A6F9BD86F for ; Fri, 24 Jul 2020 19:19:22 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 04AC36124B; Fri, 24 Jul 2020 21:19:22 +0200 (CEST) Received: from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net [195.74.38.228]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C95E961212 for ; Fri, 24 Jul 2020 21:19:17 +0200 (CEST) X-Halon-ID: 67743bf7-cde2-11ea-86ee-0050569116f7 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (p4fca2eca.dip0.t-ipconnect.de [79.202.46.202]) by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA id 67743bf7-cde2-11ea-86ee-0050569116f7; Fri, 24 Jul 2020 21:18:07 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Fri, 24 Jul 2020 21:18:50 +0200 Message-Id: <20200724191851.803350-3-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200724191851.803350-1-niklas.soderlund@ragnatech.se> References: <20200724191851.803350-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 2/3] cam: capture: Cache the EventLoop handler 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" Prepare for the ability to exit the event loop based on conditions in the request complete handler by caching the pointer instead of passing it as an argument. Signed-off-by: Niklas Söderlund Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- * Changes since v2 - Pass EventLoop to constructor instead of run() --- src/cam/capture.cpp | 13 +++++++------ src/cam/capture.h | 10 ++++++---- src/cam/main.cpp | 4 ++-- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/cam/capture.cpp b/src/cam/capture.cpp index 55fa2dabcee97f21..f811a18c579508a1 100644 --- a/src/cam/capture.cpp +++ b/src/cam/capture.cpp @@ -16,12 +16,13 @@ using namespace libcamera; -Capture::Capture(std::shared_ptr camera, CameraConfiguration *config) - : camera_(camera), config_(config), writer_(nullptr) +Capture::Capture(std::shared_ptr camera, CameraConfiguration *config, + EventLoop *loop) + : camera_(camera), config_(config), writer_(nullptr), loop_(loop) { } -int Capture::run(EventLoop *loop, const OptionsParser::Options &options) +int Capture::run(const OptionsParser::Options &options) { int ret; @@ -54,7 +55,7 @@ int Capture::run(EventLoop *loop, const OptionsParser::Options &options) FrameBufferAllocator *allocator = new FrameBufferAllocator(camera_); - ret = capture(loop, allocator); + ret = capture(allocator); if (options.isSet(OptFile)) { delete writer_; @@ -66,7 +67,7 @@ int Capture::run(EventLoop *loop, const OptionsParser::Options &options) return ret; } -int Capture::capture(EventLoop *loop, FrameBufferAllocator *allocator) +int Capture::capture(FrameBufferAllocator *allocator) { int ret; @@ -132,7 +133,7 @@ int Capture::capture(EventLoop *loop, FrameBufferAllocator *allocator) } std::cout << "Capture until user interrupts by SIGINT" << std::endl; - ret = loop->exec(); + ret = loop_->exec(); if (ret) std::cout << "Failed to run capture loop" << std::endl; diff --git a/src/cam/capture.h b/src/cam/capture.h index 9bca5661070efcf5..acdefc47b24314d2 100644 --- a/src/cam/capture.h +++ b/src/cam/capture.h @@ -24,12 +24,12 @@ class Capture { public: Capture(std::shared_ptr camera, - libcamera::CameraConfiguration *config); + libcamera::CameraConfiguration *config, + EventLoop *loop); - int run(EventLoop *loop, const OptionsParser::Options &options); + int run(const OptionsParser::Options &options); private: - int capture(EventLoop *loop, - libcamera::FrameBufferAllocator *allocator); + int capture(libcamera::FrameBufferAllocator *allocator); void requestComplete(libcamera::Request *request); @@ -39,6 +39,8 @@ private: std::map streamName_; BufferWriter *writer_; std::chrono::steady_clock::time_point last_; + + EventLoop *loop_; }; #endif /* __CAM_CAPTURE_H__ */ diff --git a/src/cam/main.cpp b/src/cam/main.cpp index ead0abe3e2abf42d..3e83feabe64e036c 100644 --- a/src/cam/main.cpp +++ b/src/cam/main.cpp @@ -341,8 +341,8 @@ int CamApp::run() } if (options_.isSet(OptCapture)) { - Capture capture(camera_, config_.get()); - return capture.run(loop_, options_); + Capture capture(camera_, config_.get(), loop_); + return capture.run(options_); } return 0;