[{"id":3399,"web_url":"https://patchwork.libcamera.org/comment/3399/","msgid":"<20200110230817.GC4859@pendragon.ideasonboard.com>","date":"2020-01-10T23:08:17","subject":"Re: [libcamera-devel] [PATCH v3 04/33] v4l2: Rename FrameMetadata\n\tto V4L2FrameMetadata","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Niklas,\n\nThank you for the patch.\n\nOn Fri, Jan 10, 2020 at 08:37:39PM +0100, Niklas Söderlund wrote:\n> With the upcoming FrameBuffer API a new library wide FrameMetadata\n> object will be added which will replace the specific implementation in\n> the V4L2 compatibility layer.\n> \n> Avoid name collisions while the new FrameBuffer API is added by renaming\n> the V4L2 compatibility layer specific implementation until it can be\n> replaced with the library wide implementation.\n> \n> Signed-off-by: Niklas Söderlund \n\nReviewed-by: Laurent Pinchart \n\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(-)\n> \n> diff --git a/src/v4l2/v4l2_camera.cpp b/src/v4l2/v4l2_camera.cpp\n> index 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> \n> diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h\n> index 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__ */\n> diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp\n> index 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()) {","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 269616067C\n\tfor ;\n\tSat, 11 Jan 2020 00:08:38 +0100 (CET)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 82BED52F;\n\tSat, 11 Jan 2020 00:08:37 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1578697717;\n\tbh=LMGyhYmxhYxpgJ1wAv4FZJjalxszj3vgGOtEVnxWX78=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=HgzGM5aKnAQkvSEaP/mhc3sDm+OIoEnosUSDgwaoOXfptOywqj157nu7BOh+E2Al0\n\t4goLM/sKWQEBiDmLYr16wkbF0GFW0Tm8cMAzDB+19N0mETQfOALf7pEQrHeoeLHDjs\n\tf7XmP1w9X6xlZV5EJtyKVVgr8+LV1k0wV6Twgr2Q=","Date":"Sat, 11 Jan 2020 01:08:17 +0200","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200110230817.GC4859@pendragon.ideasonboard.com>","References":"<20200110193808.2266294-1-niklas.soderlund@ragnatech.se>\n\t<20200110193808.2266294-5-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20200110193808.2266294-5-niklas.soderlund@ragnatech.se>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH v3 04/33] v4l2: Rename FrameMetadata\n\tto V4L2FrameMetadata","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":"Fri, 10 Jan 2020 23:08:38 -0000"}}]