NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

cam: Rename CameraSession::streamName_ to streamNames_

Browse source 
The streamName_ map contains names for all streams, rename it to
streamNames_ to make this more explicit.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2021-10-12 04:23:47 +03:00
parent 90a1720926
commit 45662c4dd7
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/cam/camera_session.cpp
View file

@ -177,11 +177,11 @@ int CameraSession::start()
return ret; return ret;
} }
streamName_.clear(); streamNames_.clear();
for (unsigned int index = 0; index < config_->size(); ++index) { for (unsigned int index = 0; index < config_->size(); ++index) {
StreamConfiguration &cfg = config_->at(index); StreamConfiguration &cfg = config_->at(index);
streamName_[cfg.stream()] = "cam" + std::to_string(cameraIndex_) streamNames_[cfg.stream()] = "cam" + std::to_string(cameraIndex_)
+ "-stream" + std::to_string(index); + "-stream" + std::to_string(index);
} }
camera_->requestCompleted.connect(this, &CameraSession::requestComplete); camera_->requestCompleted.connect(this, &CameraSession::requestComplete);
@ -369,7 +369,7 @@ void CameraSession::processRequest(Request *request)
const FrameMetadata &metadata = buffer->metadata(); const FrameMetadata &metadata = buffer->metadata();
info << " " << streamName_[stream] info << " " << streamNames_[stream]
<< " seq: " << std::setw(6) << std::setfill('0') << metadata.sequence << " seq: " << std::setw(6) << std::setfill('0') << metadata.sequence
<< " bytesused: "; << " bytesused: ";

2
src/cam/camera_session.h
View file

@ -60,7 +60,7 @@ private:
std::shared_ptr<libcamera::Camera> camera_; std::shared_ptr<libcamera::Camera> camera_;
std::unique_ptr<libcamera::CameraConfiguration> config_; std::unique_ptr<libcamera::CameraConfiguration> config_;
std::map<const libcamera::Stream *, std::string> streamName_; std::map<const libcamera::Stream *, std::string> streamNames_;
std::unique_ptr<FrameSink> sink_; std::unique_ptr<FrameSink> sink_;
unsigned int cameraIndex_; unsigned int cameraIndex_;