From patchwork Fri Jan 10 19:37:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 2551 Return-Path: Received: from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net [195.74.38.229]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D58F960673 for ; Fri, 10 Jan 2020 20:38:38 +0100 (CET) X-Halon-ID: ca93964f-33e0-11ea-b6d8-005056917f90 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (p54ac5d7b.dip0.t-ipconnect.de [84.172.93.123]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA id ca93964f-33e0-11ea-b6d8-005056917f90; Fri, 10 Jan 2020 20:38:35 +0100 (CET) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Fri, 10 Jan 2020 20:37:39 +0100 Message-Id: <20200110193808.2266294-5-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200110193808.2266294-1-niklas.soderlund@ragnatech.se> References: <20200110193808.2266294-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 04/33] v4l2: Rename FrameMetadata to V4L2FrameMetadata X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jan 2020 19:38:40 -0000 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 Reviewed-by: Laurent Pinchart --- src/v4l2/v4l2_camera.cpp | 12 ++++++------ src/v4l2/v4l2_camera.h | 8 ++++---- src/v4l2/v4l2_camera_proxy.cpp | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/v4l2/v4l2_camera.cpp b/src/v4l2/v4l2_camera.cpp index 4545483cf1c7373c..2a507b9bb8318025 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 V4L2Camera::completedBuffers() +std::vector V4L2Camera::completedBuffers() { - std::vector v; + std::vector v; bufferLock_.lock(); - for (std::unique_ptr &metadata : completedBuffers_) + for (std::unique_ptr &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 metadata = - utils::make_unique(buffer); + std::unique_ptr metadata = + utils::make_unique(buffer); completedBuffers_.push_back(std::move(metadata)); bufferLock_.unlock(); diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h index 5a889efdb4a23bd2..81f7908e5e8a6beb 100644 --- a/src/v4l2/v4l2_camera.h +++ b/src/v4l2/v4l2_camera.h @@ -19,10 +19,10 @@ using namespace libcamera; -class FrameMetadata +class V4L2FrameMetadata { public: - FrameMetadata(Buffer *buffer); + V4L2FrameMetadata(Buffer *buffer); int index() const { return index_; } @@ -51,7 +51,7 @@ public: int open(); void close(); void getStreamConfig(StreamConfiguration *streamConfig); - std::vector completedBuffers(); + std::vector completedBuffers(); void *mmap(unsigned int index); @@ -79,7 +79,7 @@ private: std::mutex bufferLock_; std::deque> pendingRequests_; - std::deque> completedBuffers_; + std::deque> completedBuffers_; }; #endif /* __V4L2_CAMERA_H__ */ diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index 00d0d57172022138..52f8468cdaa06a7a 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -174,8 +174,8 @@ void V4L2CameraProxy::querycap(std::shared_ptr camera) void V4L2CameraProxy::updateBuffers() { - std::vector completedBuffers = vcam_->completedBuffers(); - for (FrameMetadata &fmd : completedBuffers) { + std::vector completedBuffers = vcam_->completedBuffers(); + for (V4L2FrameMetadata &fmd : completedBuffers) { struct v4l2_buffer &buf = buffers_[fmd.index()]; switch (fmd.status()) {