{"id":2586,"url":"https://patchwork.libcamera.org/api/patches/2586/?format=json","web_url":"https://patchwork.libcamera.org/patch/2586/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200112010212.2609025-5-niklas.soderlund@ragnatech.se>","date":"2020-01-12T01:01:44","name":"[libcamera-devel,v4,04/32] v4l2: Rename FrameMetadata to V4L2FrameMetadata","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"d1395b38b65c5aa2911e6c47d581f932fdcd899e","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2586/mbox/","series":[{"id":617,"url":"https://patchwork.libcamera.org/api/series/617/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=617","date":"2020-01-12T01:01:40","name":"libcamera: Rework buffer API","version":4,"mbox":"https://patchwork.libcamera.org/series/617/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2586/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2586/checks/","tags":{},"headers":{"Return-Path":"","Received":["from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net\n\t[195.74.38.228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BEAF6606CE\n\tfor ;\n\tSun, 12 Jan 2020 02:03:01 +0100 (CET)","from bismarck.berto.se (p54ac5d7b.dip0.t-ipconnect.de\n\t[84.172.93.123]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid 457c5258-34d7-11ea-b6d8-005056917f90;\n\tSun, 12 Jan 2020 02:02:57 +0100 (CET)"],"X-Halon-ID":"457c5258-34d7-11ea-b6d8-005056917f90","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Sun, 12 Jan 2020 02:01:44 +0100","Message-Id":"<20200112010212.2609025-5-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.24.1","In-Reply-To":"<20200112010212.2609025-1-niklas.soderlund@ragnatech.se>","References":"<20200112010212.2609025-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 04/32] v4l2: Rename FrameMetadata to\n\tV4L2FrameMetadata","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Sun, 12 Jan 2020 01:03:02 -0000"},"content":"With the upcoming FrameBuffer API a new library wide FrameMetadata\nobject will be added which will replace the specific implementation in\nthe V4L2 compatibility layer.\n\nAvoid name collisions while the new FrameBuffer API is added by renaming\nthe V4L2 compatibility layer specific implementation until it can be\nreplaced with the library wide implementation.\n\nSigned-off-by: Niklas Söderlund \nReviewed-by: Laurent Pinchart \n---\n src/v4l2/v4l2_camera.cpp | 12 ++++++------\n src/v4l2/v4l2_camera.h | 8 ++++----\n src/v4l2/v4l2_camera_proxy.cpp | 4 ++--\n 3 files changed, 12 insertions(+), 12 deletions(-)","diff":"diff --git a/src/v4l2/v4l2_camera.cpp b/src/v4l2/v4l2_camera.cpp\nindex 4545483cf1c7373c..2a507b9bb8318025 100644\n--- a/src/v4l2/v4l2_camera.cpp\n+++ b/src/v4l2/v4l2_camera.cpp\n@@ -16,7 +16,7 @@ using namespace libcamera;\n \n LOG_DECLARE_CATEGORY(V4L2Compat);\n \n-FrameMetadata::FrameMetadata(Buffer *buffer)\n+V4L2FrameMetadata::V4L2FrameMetadata(Buffer *buffer)\n \t: index_(buffer->index()), bytesused_(buffer->bytesused()),\n \t timestamp_(buffer->timestamp()), sequence_(buffer->sequence()),\n \t status_(buffer->status())\n@@ -61,12 +61,12 @@ void V4L2Camera::getStreamConfig(StreamConfiguration *streamConfig)\n \t*streamConfig = config_->at(0);\n }\n \n-std::vector V4L2Camera::completedBuffers()\n+std::vector V4L2Camera::completedBuffers()\n {\n-\tstd::vector v;\n+\tstd::vector v;\n \n \tbufferLock_.lock();\n-\tfor (std::unique_ptr &metadata : completedBuffers_)\n+\tfor (std::unique_ptr &metadata : completedBuffers_)\n \t\tv.push_back(*metadata.get());\n \tcompletedBuffers_.clear();\n \tbufferLock_.unlock();\n@@ -82,8 +82,8 @@ void V4L2Camera::requestComplete(Request *request)\n \t/* We only have one stream at the moment. */\n \tbufferLock_.lock();\n \tBuffer *buffer = request->buffers().begin()->second;\n-\tstd::unique_ptr metadata =\n-\t\tutils::make_unique(buffer);\n+\tstd::unique_ptr metadata =\n+\t\tutils::make_unique(buffer);\n \tcompletedBuffers_.push_back(std::move(metadata));\n \tbufferLock_.unlock();\n \ndiff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h\nindex 5a889efdb4a23bd2..81f7908e5e8a6beb 100644\n--- a/src/v4l2/v4l2_camera.h\n+++ b/src/v4l2/v4l2_camera.h\n@@ -19,10 +19,10 @@\n \n using namespace libcamera;\n \n-class FrameMetadata\n+class V4L2FrameMetadata\n {\n public:\n-\tFrameMetadata(Buffer *buffer);\n+\tV4L2FrameMetadata(Buffer *buffer);\n \n \tint index() const { return index_; }\n \n@@ -51,7 +51,7 @@ public:\n \tint open();\n \tvoid close();\n \tvoid getStreamConfig(StreamConfiguration *streamConfig);\n-\tstd::vector completedBuffers();\n+\tstd::vector completedBuffers();\n \n \tvoid *mmap(unsigned int index);\n \n@@ -79,7 +79,7 @@ private:\n \tstd::mutex bufferLock_;\n \n \tstd::deque> pendingRequests_;\n-\tstd::deque> completedBuffers_;\n+\tstd::deque> completedBuffers_;\n };\n \n #endif /* __V4L2_CAMERA_H__ */\ndiff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp\nindex 00d0d57172022138..52f8468cdaa06a7a 100644\n--- a/src/v4l2/v4l2_camera_proxy.cpp\n+++ b/src/v4l2/v4l2_camera_proxy.cpp\n@@ -174,8 +174,8 @@ void V4L2CameraProxy::querycap(std::shared_ptr camera)\n \n void V4L2CameraProxy::updateBuffers()\n {\n-\tstd::vector completedBuffers = vcam_->completedBuffers();\n-\tfor (FrameMetadata &fmd : completedBuffers) {\n+\tstd::vector completedBuffers = vcam_->completedBuffers();\n+\tfor (V4L2FrameMetadata &fmd : completedBuffers) {\n \t\tstruct v4l2_buffer &buf = buffers_[fmd.index()];\n \n \t\tswitch (fmd.status()) {\n","prefixes":["libcamera-devel","v4","04/32"]}