{"id":12843,"url":"https://patchwork.libcamera.org/api/patches/12843/?format=json","web_url":"https://patchwork.libcamera.org/patch/12843/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210707021941.20804-31-laurent.pinchart@ideasonboard.com>","date":"2021-07-07T02:19:41","name":"[libcamera-devel,30/30] cam: Support using multiple cameras concurrently","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"3a733aa117874c5f5e42c8edb52a256e0bb70b6c","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12843/mbox/","series":[{"id":2213,"url":"https://patchwork.libcamera.org/api/series/2213/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2213","date":"2021-07-07T02:19:12","name":"Multi-camera support in the cam application","version":1,"mbox":"https://patchwork.libcamera.org/series/2213/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12843/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12843/checks/","tags":{},"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 9F8E7C3225\n\tfor ;\n\tWed, 7 Jul 2021 02:20:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4C34368545;\n\tWed, 7 Jul 2021 04:20:57 +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 D0AA86853D\n\tfor ;\n\tWed, 7 Jul 2021 04:20:42 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 5AC732E4\n\tfor ;\n\tWed, 7 Jul 2021 04:20:42 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"Oz+Ljodz\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1625624442;\n\tbh=+Vr+A16LFPuT7ezD92xX+rfMy+nA/X1judsbP41LwTo=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=Oz+Ljodz3iWVW7tYv2jpz1+gNIJjGoWmwxA1Vt8pNec0hKurb2FlLp+/pqwg5rJ5S\n\tihCOwk/oNJgLfJgXnPZMT+VYzdbAuiSAVfwd/PVBKMqZQaAy6gH24EEEphoBi64glN\n\tU2es2MdIpr07Rt88sehqQlSQNhOEIxDciyig4/qw=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 7 Jul 2021 05:19:41 +0300","Message-Id":"<20210707021941.20804-31-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210707021941.20804-1-laurent.pinchart@ideasonboard.com>","References":"<20210707021941.20804-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 30/30] cam: Support using multiple cameras\n\tconcurrently","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\" "},"content":"To allow testing capture from multiple cameras concurrently, turn the\n--camera option into an array option, and create one CameraSession per\nspecified camera. The code is adapted to iterate over the sessions\nvector instead of handling a single session. Thanks to all the\nrefactoring previously performed, changes are minimal.\n\nSigned-off-by: Laurent Pinchart \n---\n src/cam/camera_session.cpp | 8 +++--\n src/cam/main.cpp | 67 ++++++++++++++++++++++----------------\n 2 files changed, 45 insertions(+), 30 deletions(-)","diff":"diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\nindex 90261a8cde2e..0d49fc1ade83 100644\n--- a/src/cam/camera_session.cpp\n+++ b/src/cam/camera_session.cpp\n@@ -250,9 +250,13 @@ int CameraSession::startCapture()\n \t}\n \n \tif (captureLimit_)\n-\t\tstd::cout << \"Capture \" << captureLimit_ << \" frames\" << std::endl;\n+\t\tstd::cout << \"cam\" << cameraIndex_\n+\t\t\t << \": Capture \" << captureLimit_ << \" frames\"\n+\t\t\t << std::endl;\n \telse\n-\t\tstd::cout << \"Capture until user interrupts by SIGINT\" << std::endl;\n+\t\tstd::cout << \"cam\" << cameraIndex_\n+\t\t\t << \": Capture until user interrupts by SIGINT\"\n+\t\t\t << std::endl;\n \n \treturn 0;\n }\ndiff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 96f55831ca69..f9a90672a474 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -112,7 +112,7 @@ int CamApp::parseOptions(int argc, char *argv[])\n \tOptionsParser parser;\n \tparser.addOption(OptCamera, OptionString,\n \t\t\t \"Specify which camera to operate on, by id or by index\", \"camera\",\n-\t\t\t ArgumentRequired, \"camera\");\n+\t\t\t ArgumentRequired, \"camera\", true);\n \tparser.addOption(OptHelp, OptionNone, \"Display this help message\",\n \t\t\t \"help\");\n \tparser.addOption(OptInfo, OptionNone,\n@@ -195,45 +195,52 @@ int CamApp::run()\n \t\t}\n \t}\n \n-\t/* 2. Create the camera session. */\n-\tstd::unique_ptr session;\n+\t/* 2. Create the camera sessions. */\n+\tstd::vector> sessions;\n \n \tif (options_.isSet(OptCamera)) {\n-\t\tconst OptionValue &camera = options_[OptCamera];\n-\t\tsession = std::make_unique(cm_.get(),\n-\t\t\t\t\t\t\t camera.toString(), 0,\n-\t\t\t\t\t\t\t camera.children());\n-\t\tif (!session->isValid()) {\n-\t\t\tstd::cout << \"Failed to create camera session\" << std::endl;\n-\t\t\treturn -EINVAL;\n+\t\tunsigned int index = 0;\n+\n+\t\tfor (const OptionValue &camera : options_[OptCamera].toArray()) {\n+\t\t\tstd::unique_ptr session =\n+\t\t\t\tstd::make_unique(cm_.get(),\n+\t\t\t\t\t\t\t\tcamera.toString(),\n+\t\t\t\t\t\t\t\tindex,\n+\t\t\t\t\t\t\t\tcamera.children());\n+\t\t\tif (!session->isValid()) {\n+\t\t\t\tstd::cout << \"Failed to create camera session\" << std::endl;\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\n+\t\t\tstd::cout << \"Using camera \" << session->camera()->id()\n+\t\t\t\t << \" as cam\" << index << std::endl;\n+\n+\t\t\tsession->captureDone.connect(this, &CamApp::captureDone);\n+\n+\t\t\tsessions.push_back(std::move(session));\n+\t\t\tindex++;\n \t\t}\n-\n-\t\tstd::cout << \"Using camera \" << session->camera()->id()\n-\t\t\t << std::endl;\n-\n-\t\tsession->captureDone.connect(this, &CamApp::captureDone);\n \t}\n \n \t/* 3. Print camera information. */\n \tif (options_.isSet(OptListControls) ||\n \t options_.isSet(OptListProperties) ||\n \t options_.isSet(OptInfo)) {\n-\t\tif (!session) {\n-\t\t\tstd::cout << \"Cannot print camera information without a camera\"\n-\t\t\t\t << std::endl;\n-\t\t\treturn -EINVAL;\n+\t\tfor (const auto &session : sessions) {\n+\t\t\tif (options_.isSet(OptListControls))\n+\t\t\t\tsession->listControls();\n+\t\t\tif (options_.isSet(OptListProperties))\n+\t\t\t\tsession->listProperties();\n+\t\t\tif (options_.isSet(OptInfo))\n+\t\t\t\tsession->infoConfiguration();\n \t\t}\n-\n-\t\tif (options_.isSet(OptListControls))\n-\t\t\tsession->listControls();\n-\t\tif (options_.isSet(OptListProperties))\n-\t\t\tsession->listProperties();\n-\t\tif (options_.isSet(OptInfo))\n-\t\t\tsession->infoConfiguration();\n \t}\n \n \t/* 4. Start capture. */\n-\tif (session && session->options().isSet(OptCapture)) {\n+\tfor (const auto &session : sessions) {\n+\t\tif (!session->options().isSet(OptCapture))\n+\t\t\tcontinue;\n+\n \t\tret = session->start();\n \t\tif (ret) {\n \t\t\tstd::cout << \"Failed to start camera session\" << std::endl;\n@@ -258,8 +265,12 @@ int CamApp::run()\n \t\tloop_.exec();\n \n \t/* 6. Stop capture. */\n-\tif (session && session->options().isSet(OptCapture))\n+\tfor (const auto &session : sessions) {\n+\t\tif (!session->options().isSet(OptCapture))\n+\t\t\tcontinue;\n+\n \t\tsession->stop();\n+\t}\n \n \treturn 0;\n }\n","prefixes":["libcamera-devel","30/30"]}