{"id":12942,"url":"https://patchwork.libcamera.org/api/1.1/patches/12942/?format=json","web_url":"https://patchwork.libcamera.org/patch/12942/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20210712215645.30478-30-laurent.pinchart@ideasonboard.com>","date":"2021-07-12T21:56:44","name":"[libcamera-devel,v2,29/30] cam: Add camera index to file name of capture frames","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"75cbff783f01ac3d0b37701d421efca77cfcfcdf","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12942/mbox/","series":[{"id":2229,"url":"https://patchwork.libcamera.org/api/1.1/series/2229/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2229","date":"2021-07-12T21:56:15","name":"Multi-camera support in the cam application","version":2,"mbox":"https://patchwork.libcamera.org/series/2229/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12942/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12942/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 9E1ACC3226\n\tfor ;\n\tMon, 12 Jul 2021 21:58:00 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4702868552;\n\tMon, 12 Jul 2021 23:58:00 +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 A849F6853F\n\tfor ;\n\tMon, 12 Jul 2021 23:57:45 +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 2A200CC\n\tfor ;\n\tMon, 12 Jul 2021 23:57:45 +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=\"rV1Nqj4n\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1626127065;\n\tbh=WcUvIYfImzt2/RtVjdPZmxbI5bAK5OVzRierECcluQE=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=rV1Nqj4niYzb07Bq47rdEbp7IhF/QcxdXrdKeSF4ey9gwIZbBtN+fxBndT8JJrmj3\n\t+RCMD/MLw1x6vPWtirT7Jg10IujJlxbxxRC5gy1Z8j3qfSAWPxF/6E18O5ayeA+BgF\n\tPmXJMmYlhJlwmYnWMd08MZBTCy07kIFTM6ZmhqGk=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 13 Jul 2021 00:56:44 +0300","Message-Id":"<20210712215645.30478-30-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","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 29/30] cam: Add camera index to file\n\tname of capture frames","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 prepare for multi-camera support, extend the file naming scheme for\ncaptured frames to include the camera index in addition to the stream\nname and frame number.\n\nSigned-off-by: Laurent Pinchart \nReviewed-by: Kieran Bingham \n---\n src/cam/camera_session.cpp | 9 ++++++---\n src/cam/camera_session.h | 4 +++-\n src/cam/main.cpp | 4 ++--\n 3 files changed, 11 insertions(+), 6 deletions(-)","diff":"diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\nindex f2383567af3b..90261a8cde2e 100644\n--- a/src/cam/camera_session.cpp\n+++ b/src/cam/camera_session.cpp\n@@ -22,9 +22,11 @@ using namespace libcamera;\n \n CameraSession::CameraSession(CameraManager *cm,\n \t\t\t const std::string &cameraId,\n+\t\t\t unsigned int cameraIndex,\n \t\t\t const OptionsParser::Options &options)\n-\t: options_(options), last_(0), queueCount_(0), captureCount_(0),\n-\t captureLimit_(0), printMetadata_(false)\n+\t: options_(options), cameraIndex_(cameraIndex), last_(0),\n+\t queueCount_(0), captureCount_(0), captureLimit_(0),\n+\t printMetadata_(false)\n {\n \tchar *endptr;\n \tunsigned long index = strtoul(cameraId.c_str(), &endptr, 10);\n@@ -152,7 +154,8 @@ int CameraSession::start()\n \tstreamName_.clear();\n \tfor (unsigned int index = 0; index < config_->size(); ++index) {\n \t\tStreamConfiguration &cfg = config_->at(index);\n-\t\tstreamName_[cfg.stream()] = \"stream\" + std::to_string(index);\n+\t\tstreamName_[cfg.stream()] = \"cam\" + std::to_string(cameraIndex_)\n+\t\t\t\t\t + \"-stream\" + std::to_string(index);\n \t}\n \n \tcamera_->requestCompleted.connect(this, &CameraSession::requestComplete);\ndiff --git a/src/cam/camera_session.h b/src/cam/camera_session.h\nindex b31363834f68..b0f50e7f998e 100644\n--- a/src/cam/camera_session.h\n+++ b/src/cam/camera_session.h\n@@ -28,7 +28,7 @@ class CameraSession\n {\n public:\n \tCameraSession(libcamera::CameraManager *cm,\n-\t\t const std::string &cameraId,\n+\t\t const std::string &cameraId, unsigned int cameraIndex,\n \t\t const OptionsParser::Options &options);\n \t~CameraSession();\n \n@@ -60,6 +60,8 @@ private:\n \n \tstd::map streamName_;\n \tstd::unique_ptr writer_;\n+\tunsigned int cameraIndex_;\n+\n \tuint64_t last_;\n \n \tunsigned int queueCount_;\ndiff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 7688fa5540ea..96f55831ca69 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -136,7 +136,7 @@ int CamApp::parseOptions(int argc, char *argv[])\n \t\t\t \"If the file name ends with a '/', it sets the directory in which\\n\"\n \t\t\t \"to write files, using the default file name. Otherwise it sets the\\n\"\n \t\t\t \"full file path and name. The first '#' character in the file name\\n\"\n-\t\t\t \"is expanded to the stream name and frame sequence number.\\n\"\n+\t\t\t \"is expanded to the camera index, stream name and frame sequence number.\\n\"\n \t\t\t \"The default file name is 'frame-#.bin'.\",\n \t\t\t \"file\", ArgumentOptional, \"filename\", false,\n \t\t\t OptCamera);\n@@ -201,7 +201,7 @@ int CamApp::run()\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(),\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","prefixes":["libcamera-devel","v2","29/30"]}