[{"id":4226,"web_url":"https://patchwork.libcamera.org/comment/4226/","msgid":"<59aad736-a5ba-1584-719e-d0715fddc847@ideasonboard.com>","date":"2020-03-23T16:16:04","subject":"Re: [libcamera-devel] [PATCH 13/21] qcam: viewfinder: Add\n\tMappedBuffer to store memory mapping information","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 23/03/2020 14:21, Laurent Pinchart wrote:\n> The new MappedBuffer structure replaces the std::pair<> used in the\n> mapped buffers map, and allows passing data to the ViewFinder::display()\n> function in a more structured way.\n> \n\nSeems reasonable for now ...\n\nReviewed-by: Kieran Bingham \n\n> Signed-off-by: Laurent Pinchart \n> ---\n> src/qcam/main_window.cpp | 20 ++++++--------------\n> src/qcam/main_window.h | 4 ++--\n> src/qcam/viewfinder.cpp | 6 ++++--\n> src/qcam/viewfinder.h | 10 +++++++++-\n> 4 files changed, 21 insertions(+), 19 deletions(-)\n> \n> diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\n> index 184345b0e2a6..c0feb91a6fb1 100644\n> --- a/src/qcam/main_window.cpp\n> +++ b/src/qcam/main_window.cpp\n> @@ -28,8 +28,6 @@\n> #include \n> #include \n> \n> -#include \"viewfinder.h\"\n> -\n> using namespace libcamera;\n> \n> /**\n> @@ -350,8 +348,7 @@ int MainWindow::startCapture()\n> \t\tconst FrameBuffer::Plane &plane = buffer->planes().front();\n> \t\tvoid *memory = mmap(NULL, plane.length, PROT_READ, MAP_SHARED,\n> \t\t\t\t plane.fd.fd(), 0);\n> -\t\tmappedBuffers_[plane.fd.fd()] =\n> -\t\t\tstd::make_pair(memory, plane.length);\n> +\t\tmappedBuffers_[buffer.get()] = { memory, plane.length };\n> \t}\n> \n> \t/* Start the title timer and the camera. */\n> @@ -391,9 +388,8 @@ error:\n> \t\tdelete request;\n> \n> \tfor (auto &iter : mappedBuffers_) {\n> -\t\tvoid *memory = iter.second.first;\n> -\t\tunsigned int length = iter.second.second;\n> -\t\tmunmap(memory, length);\n> +\t\tconst MappedBuffer &buffer = iter.second;\n> +\t\tmunmap(buffer.memory, buffer.size);\n> \t}\n> \tmappedBuffers_.clear();\n> \n> @@ -421,9 +417,8 @@ void MainWindow::stopCapture()\n> \tcamera_->requestCompleted.disconnect(this, &MainWindow::requestComplete);\n> \n> \tfor (auto &iter : mappedBuffers_) {\n> -\t\tvoid *memory = iter.second.first;\n> -\t\tunsigned int length = iter.second.second;\n> -\t\tmunmap(memory, length);\n> +\t\tconst MappedBuffer &buffer = iter.second;\n> +\t\tmunmap(buffer.memory, buffer.size);\n> \t}\n> \tmappedBuffers_.clear();\n> \n> @@ -529,10 +524,7 @@ int MainWindow::display(FrameBuffer *buffer)\n> \tif (buffer->planes().size() != 1)\n> \t\treturn -EINVAL;\n> \n> -\tconst FrameBuffer::Plane &plane = buffer->planes().front();\n> -\tvoid *memory = mappedBuffers_[plane.fd.fd()].first;\n> -\tunsigned char *raw = static_cast(memory);\n> -\tviewfinder_->display(raw, buffer->metadata().planes[0].bytesused);\n> +\tviewfinder_->display(buffer, &mappedBuffers_[buffer]);\n\nWow, yes that's simpler!\n\n> \n> \treturn 0;\n> }\n> diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\n> index fcde88c14f77..0918ae5307d8 100644\n> --- a/src/qcam/main_window.h\n> +++ b/src/qcam/main_window.h\n> @@ -23,11 +23,11 @@\n> #include \n> \n> #include \"../cam/options.h\"\n> +#include \"viewfinder.h\"\n> \n> using namespace libcamera;\n> \n> class QAction;\n> -class ViewFinder;\n> \n> enum {\n> \tOptCamera = 'c',\n> @@ -85,7 +85,7 @@ private:\n> \tFrameBufferAllocator *allocator_;\n> \n> \tstd::unique_ptr config_;\n> -\tstd::map> mappedBuffers_;\n> +\tstd::map mappedBuffers_;\n> \n> \t/* Capture state, buffers queue and statistics */\n> \tbool isCapturing_;\n> diff --git a/src/qcam/viewfinder.cpp b/src/qcam/viewfinder.cpp\n> index 066ac605e7b4..d00edc33dfb7 100644\n> --- a/src/qcam/viewfinder.cpp\n> +++ b/src/qcam/viewfinder.cpp\n> @@ -24,7 +24,8 @@ ViewFinder::~ViewFinder()\n> \tdelete image_;\n> }\n> \n> -void ViewFinder::display(const unsigned char *raw, size_t size)\n> +void ViewFinder::display(const libcamera::FrameBuffer *buffer,\n> +\t\t\t MappedBuffer *map)\n> {\n> \tQMutexLocker locker(&mutex_);\n> \n> @@ -34,7 +35,8 @@ void ViewFinder::display(const unsigned char *raw, size_t size)\n> \t * impacting performances.\n> \t */\n> \n> -\tconverter_.convert(raw, size, image_);\n> +\tconverter_.convert(static_cast(map->memory),\n> +\t\t\t buffer->metadata().planes[0].bytesused, image_);\n> \tupdate();\n> }\n> \n> diff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h\n> index a019c3a470ea..735a6b67e91d 100644\n> --- a/src/qcam/viewfinder.h\n> +++ b/src/qcam/viewfinder.h\n> @@ -7,16 +7,24 @@\n> #ifndef __QCAM_VIEWFINDER_H__\n> #define __QCAM_VIEWFINDER_H__\n> \n> +#include \n> +\n> #include \n> #include \n> #include \n> \n> +#include \n> #include \n> \n> #include \"format_converter.h\"\n> \n> class QImage;\n> \n> +struct MappedBuffer {\n> +\tvoid *memory;\n> +\tsize_t size;\n> +};\n> +\n> class ViewFinder : public QWidget\n> {\n> public:\n> @@ -24,7 +32,7 @@ public:\n> \t~ViewFinder();\n> \n> \tint setFormat(const libcamera::PixelFormat &format, const QSize &size);\n> -\tvoid display(const unsigned char *rgb, size_t size);\n> +\tvoid display(const libcamera::FrameBuffer *buffer, MappedBuffer *map);\n> \n> \tQImage getCurrentImage();\n> \n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D627A60429\n\tfor ;\n\tMon, 23 Mar 2020 17:16:07 +0100 (CET)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 5BCA2308;\n\tMon, 23 Mar 2020 17:16:07 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1584980167;\n\tbh=udVNxOq31r75wZsx1UcOHqRyt5NHrPBkl3Js0h3eyxw=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=UH6mz3UIazd81cZVkNQllzLhaGssMTYioM+zzYERRhVLAHKWtQY6o8VyPld6Ry7RW\n\tiskNys4lmJFs1dxcXsOSgHahom9H554N08ZLTcWcay8er4xyTQQbyUg2mg0oIOgDhj\n\tMwO1JwIwp5IiHXvh3iZMlt0yXE5H7PPFRMtYl2Pw=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200323142205.28342-1-laurent.pinchart@ideasonboard.com>\n\t<20200323142205.28342-14-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<59aad736-a5ba-1584-719e-d0715fddc847@ideasonboard.com>","Date":"Mon, 23 Mar 2020 16:16:04 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.9.1","MIME-Version":"1.0","In-Reply-To":"<20200323142205.28342-14-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH 13/21] qcam: viewfinder: Add\n\tMappedBuffer to store memory mapping information","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":"Mon, 23 Mar 2020 16:16:08 -0000"}}]