From 721f4b03d80fc7b65cfb4c7ecebe545ef1fe0565 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 7 Jul 2021 03:34:28 +0300 Subject: cam: Add camera index to file name of capture frames To prepare for multi-camera support, extend the file naming scheme for captured frames to include the camera index in addition to the stream name and frame number. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/cam/camera_session.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/cam/camera_session.cpp') diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp index f2383567..90261a8c 100644 --- a/src/cam/camera_session.cpp +++ b/src/cam/camera_session.cpp @@ -22,9 +22,11 @@ using namespace libcamera; CameraSession::CameraSession(CameraManager *cm, const std::string &cameraId, + unsigned int cameraIndex, const OptionsParser::Options &options) - : options_(options), last_(0), queueCount_(0), captureCount_(0), - captureLimit_(0), printMetadata_(false) + : options_(options), cameraIndex_(cameraIndex), last_(0), + queueCount_(0), captureCount_(0), captureLimit_(0), + printMetadata_(false) { char *endptr; unsigned long index = strtoul(cameraId.c_str(), &endptr, 10); @@ -152,7 +154,8 @@ int CameraSession::start() streamName_.clear(); for (unsigned int index = 0; index < config_->size(); ++index) { StreamConfiguration &cfg = config_->at(index); - streamName_[cfg.stream()] = "stream" + std::to_string(index); + streamName_[cfg.stream()] = "cam" + std::to_string(cameraIndex_) + + "-stream" + std::to_string(index); } camera_->requestCompleted.connect(this, &CameraSession::requestComplete); -- cgit v1.2.1