diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2021-10-12 04:23:47 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2021-10-15 05:05:29 +0300 |
| commit | 45662c4dd757cff33ebbf296c8f656c17c9022b5 (patch) | |
| tree | 43814cfeacc211452ce15e58f593b13d5cf67d36 | |
| parent | 90a17209266597eaf16162d4ff13d72007a25e67 (diff) | |
cam: Rename CameraSession::streamName_ to streamNames_
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>
| -rw-r--r-- | src/cam/camera_session.cpp | 8 | ||||
| -rw-r--r-- | src/cam/camera_session.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp index 32a373a9..5a25baab 100644 --- a/src/cam/camera_session.cpp +++ b/src/cam/camera_session.cpp @@ -177,11 +177,11 @@ int CameraSession::start() return ret; } - streamName_.clear(); + streamNames_.clear(); for (unsigned int index = 0; index < config_->size(); ++index) { StreamConfiguration &cfg = config_->at(index); - streamName_[cfg.stream()] = "cam" + std::to_string(cameraIndex_) - + "-stream" + std::to_string(index); + streamNames_[cfg.stream()] = "cam" + std::to_string(cameraIndex_) + + "-stream" + std::to_string(index); } camera_->requestCompleted.connect(this, &CameraSession::requestComplete); @@ -369,7 +369,7 @@ void CameraSession::processRequest(Request *request) const FrameMetadata &metadata = buffer->metadata(); - info << " " << streamName_[stream] + info << " " << streamNames_[stream] << " seq: " << std::setw(6) << std::setfill('0') << metadata.sequence << " bytesused: "; diff --git a/src/cam/camera_session.h b/src/cam/camera_session.h index 2ccc7197..a7f92d61 100644 --- a/src/cam/camera_session.h +++ b/src/cam/camera_session.h @@ -60,7 +60,7 @@ private: std::shared_ptr<libcamera::Camera> camera_; 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_; unsigned int cameraIndex_; |