diff options
| author | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2020-01-09 14:26:59 +0100 |
|---|---|---|
| committer | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2020-01-12 16:10:37 +0100 |
| commit | 35ac23dca19ea31f17a526679a697e3e327e6af1 (patch) | |
| tree | c5375ed13fdbe34a237046b371c3094a7aaf6a04 /src/v4l2/v4l2_camera.cpp | |
| parent | 5f316d0035b5481c3e1e637362c11649b5bba819 (diff) | |
v4l2: Rename FrameMetadata to V4L2FrameMetadata
With the upcoming FrameBuffer API a new library wide FrameMetadata
object will be added which will replace the specific implementation in
the V4L2 compatibility layer.
Avoid name collisions while the new FrameBuffer API is added by renaming
the V4L2 compatibility layer specific implementation until it can be
replaced with the library wide implementation.
Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src/v4l2/v4l2_camera.cpp')
| -rw-r--r-- | src/v4l2/v4l2_camera.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/v4l2/v4l2_camera.cpp b/src/v4l2/v4l2_camera.cpp index 4545483c..2a507b9b 100644 --- a/src/v4l2/v4l2_camera.cpp +++ b/src/v4l2/v4l2_camera.cpp @@ -16,7 +16,7 @@ using namespace libcamera; LOG_DECLARE_CATEGORY(V4L2Compat); -FrameMetadata::FrameMetadata(Buffer *buffer) +V4L2FrameMetadata::V4L2FrameMetadata(Buffer *buffer) : index_(buffer->index()), bytesused_(buffer->bytesused()), timestamp_(buffer->timestamp()), sequence_(buffer->sequence()), status_(buffer->status()) @@ -61,12 +61,12 @@ void V4L2Camera::getStreamConfig(StreamConfiguration *streamConfig) *streamConfig = config_->at(0); } -std::vector<FrameMetadata> V4L2Camera::completedBuffers() +std::vector<V4L2FrameMetadata> V4L2Camera::completedBuffers() { - std::vector<FrameMetadata> v; + std::vector<V4L2FrameMetadata> v; bufferLock_.lock(); - for (std::unique_ptr<FrameMetadata> &metadata : completedBuffers_) + for (std::unique_ptr<V4L2FrameMetadata> &metadata : completedBuffers_) v.push_back(*metadata.get()); completedBuffers_.clear(); bufferLock_.unlock(); @@ -82,8 +82,8 @@ void V4L2Camera::requestComplete(Request *request) /* We only have one stream at the moment. */ bufferLock_.lock(); Buffer *buffer = request->buffers().begin()->second; - std::unique_ptr<FrameMetadata> metadata = - utils::make_unique<FrameMetadata>(buffer); + std::unique_ptr<V4L2FrameMetadata> metadata = + utils::make_unique<V4L2FrameMetadata>(buffer); completedBuffers_.push_back(std::move(metadata)); bufferLock_.unlock(); |