From patchwork Mon Jul 12 21:56:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 12943 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 21C01C322C for ; Mon, 12 Jul 2021 21:58:01 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C3E6A68513; Mon, 12 Jul 2021 23:58:00 +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="JRLjA8ni"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3EAD668558 for ; Mon, 12 Jul 2021 23:57:46 +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 DF3E73F1 for ; Mon, 12 Jul 2021 23:57:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1626127066; bh=tBFlXE0IpZ4abGNJFOlr9CXaparhYwjcTWRjHmckWE4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=JRLjA8nikKAgJl7cjIpZBeinqJDHpzj0ee4thxHwYD5pEdvDzeEfs/D0APJR3lEY6 ia3Cj2erQdf4PjJLtHS+/6vjajVlYr/EkLQ/A43FfA6B+jeUPLIQKJGFZ0+r5gAgkF FB5KS+lu9XrVWSAmFgRcoQSVMjdxL3aGXmy1kk6M= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Tue, 13 Jul 2021 00:56:45 +0300 Message-Id: <20210712215645.30478-31-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210712215645.30478-1-laurent.pinchart@ideasonboard.com> References: <20210712215645.30478-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 30/30] cam: Support using multiple cameras concurrently 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" To allow testing capture from multiple cameras concurrently, turn the --camera option into an array option, and create one CameraSession per specified camera. The code is adapted to iterate over the sessions vector instead of handling a single session. Thanks to all the refactoring previously performed, changes are minimal. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/cam/camera_session.cpp | 8 +++-- src/cam/main.cpp | 67 ++++++++++++++++++++++---------------- 2 files changed, 45 insertions(+), 30 deletions(-) diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp index 90261a8cde2e..0d49fc1ade83 100644 --- a/src/cam/camera_session.cpp +++ b/src/cam/camera_session.cpp @@ -250,9 +250,13 @@ int CameraSession::startCapture() } if (captureLimit_) - std::cout << "Capture " << captureLimit_ << " frames" << std::endl; + std::cout << "cam" << cameraIndex_ + << ": Capture " << captureLimit_ << " frames" + << std::endl; else - std::cout << "Capture until user interrupts by SIGINT" << std::endl; + std::cout << "cam" << cameraIndex_ + << ": Capture until user interrupts by SIGINT" + << std::endl; return 0; } diff --git a/src/cam/main.cpp b/src/cam/main.cpp index 96f55831ca69..f9a90672a474 100644 --- a/src/cam/main.cpp +++ b/src/cam/main.cpp @@ -112,7 +112,7 @@ int CamApp::parseOptions(int argc, char *argv[]) OptionsParser parser; parser.addOption(OptCamera, OptionString, "Specify which camera to operate on, by id or by index", "camera", - ArgumentRequired, "camera"); + ArgumentRequired, "camera", true); parser.addOption(OptHelp, OptionNone, "Display this help message", "help"); parser.addOption(OptInfo, OptionNone, @@ -195,45 +195,52 @@ int CamApp::run() } } - /* 2. Create the camera session. */ - std::unique_ptr session; + /* 2. Create the camera sessions. */ + std::vector> sessions; if (options_.isSet(OptCamera)) { - const OptionValue &camera = options_[OptCamera]; - session = std::make_unique(cm_.get(), - camera.toString(), 0, - camera.children()); - if (!session->isValid()) { - std::cout << "Failed to create camera session" << std::endl; - return -EINVAL; + unsigned int index = 0; + + for (const OptionValue &camera : options_[OptCamera].toArray()) { + std::unique_ptr session = + std::make_unique(cm_.get(), + camera.toString(), + index, + camera.children()); + if (!session->isValid()) { + std::cout << "Failed to create camera session" << std::endl; + return -EINVAL; + } + + std::cout << "Using camera " << session->camera()->id() + << " as cam" << index << std::endl; + + session->captureDone.connect(this, &CamApp::captureDone); + + sessions.push_back(std::move(session)); + index++; } - - std::cout << "Using camera " << session->camera()->id() - << std::endl; - - session->captureDone.connect(this, &CamApp::captureDone); } /* 3. Print camera information. */ if (options_.isSet(OptListControls) || options_.isSet(OptListProperties) || options_.isSet(OptInfo)) { - if (!session) { - std::cout << "Cannot print camera information without a camera" - << std::endl; - return -EINVAL; + for (const auto &session : sessions) { + if (options_.isSet(OptListControls)) + session->listControls(); + if (options_.isSet(OptListProperties)) + session->listProperties(); + if (options_.isSet(OptInfo)) + session->infoConfiguration(); } - - if (options_.isSet(OptListControls)) - session->listControls(); - if (options_.isSet(OptListProperties)) - session->listProperties(); - if (options_.isSet(OptInfo)) - session->infoConfiguration(); } /* 4. Start capture. */ - if (session && session->options().isSet(OptCapture)) { + for (const auto &session : sessions) { + if (!session->options().isSet(OptCapture)) + continue; + ret = session->start(); if (ret) { std::cout << "Failed to start camera session" << std::endl; @@ -258,8 +265,12 @@ int CamApp::run() loop_.exec(); /* 6. Stop capture. */ - if (session && session->options().isSet(OptCapture)) + for (const auto &session : sessions) { + if (!session->options().isSet(OptCapture)) + continue; + session->stop(); + } return 0; }