[{"id":4232,"web_url":"https://patchwork.libcamera.org/comment/4232/","msgid":"<394fe357-d382-153c-e781-168427b010da@ideasonboard.com>","date":"2020-03-23T17:09:29","subject":"Re: [libcamera-devel] [PATCH 15/21] qcam: viewfinder: Make the\n\tviewfinder hold a reference to a buffer","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 viewfinder is currently expected to render frames to the screen\n> synchronously in the display() function, or at least to copy data so\n> that the buffer can be queued in a new request when the function\n> returns. This prevents optimisations when the capture format is\n> identical to the display format.\n> \n> Make the viewfinder take ownership of the buffer, and notify of its\n> release through a signal. The release is currently still synchronous,\n> this will be addressed in a subsequent patch.\n> \n> Rename the ViewFinder::display() function to render() to better describe\n> its purpose, as it's meant to start the rendering and not display the\n> frame synchronously.\n\nReviewed-by: Kieran Bingham \n\n> Signed-off-by: Laurent Pinchart \n> ---\n> src/qcam/main_window.cpp | 13 ++++---------\n> src/qcam/main_window.h | 4 ++--\n> src/qcam/meson.build | 1 +\n> src/qcam/viewfinder.cpp | 5 +++--\n> src/qcam/viewfinder.h | 7 ++++++-\n> 5 files changed, 16 insertions(+), 14 deletions(-)\n> \n> diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\n> index ad0d6bf4f3e5..b68e171c5e01 100644\n> --- a/src/qcam/main_window.cpp\n> +++ b/src/qcam/main_window.cpp\n> @@ -64,6 +64,8 @@ MainWindow::MainWindow(CameraManager *cm, const OptionsParser::Options &options)\n> \tconnect(&titleTimer_, SIGNAL(timeout()), this, SLOT(updateTitle()));\n> \n> \tviewfinder_ = new ViewFinder(this);\n> +\tconnect(viewfinder_, &ViewFinder::renderComplete,\n> +\t\tthis, &MainWindow::queueRequest);\n> \tsetCentralWidget(viewfinder_);\n> \tadjustSize();\n> \n> @@ -513,15 +515,8 @@ void MainWindow::processCapture()\n> \t\t<< \"timestamp:\" << metadata.timestamp\n> \t\t<< \"fps:\" << Qt::fixed << qSetRealNumberPrecision(2) << fps;\n> \n> -\t/* Display the buffer and requeue it to the camera. */\n> -\tdisplay(buffer);\n> -\n> -\tqueueRequest(buffer);\n> -}\n> -\n> -void MainWindow::display(FrameBuffer *buffer)\n> -{\n> -\tviewfinder_->display(buffer, &mappedBuffers_[buffer]);\n> +\t/* Render the frame on the viewfinder. */\n> +\tviewfinder_->render(buffer, &mappedBuffers_[buffer]);\n> }\n> \n> void MainWindow::queueRequest(FrameBuffer *buffer)\n> diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\n> index 03db761b58e4..1a2ccbd632b0 100644\n> --- a/src/qcam/main_window.h\n> +++ b/src/qcam/main_window.h\n> @@ -54,6 +54,8 @@ private Q_SLOTS:\n> \n> \tvoid saveImageAs();\n> \n> +\tvoid queueRequest(FrameBuffer *buffer);\n> +\n> private:\n> \tint createToolbars();\n> \n> @@ -65,8 +67,6 @@ private:\n> \n> \tvoid requestComplete(Request *request);\n> \tvoid processCapture();\n> -\tvoid display(FrameBuffer *buffer);\n> -\tvoid queueRequest(FrameBuffer *buffer);\n> \n> \t/* UI elements */\n> \tQToolBar *toolbar_;\n> diff --git a/src/qcam/meson.build b/src/qcam/meson.build\n> index 214bfb12aabb..c256d06f8ccf 100644\n> --- a/src/qcam/meson.build\n> +++ b/src/qcam/meson.build\n> @@ -8,6 +8,7 @@ qcam_sources = files([\n> \n> qcam_moc_headers = files([\n> 'main_window.h',\n> + 'viewfinder.h',\n> ])\n> \n> qcam_resources = files([\n> diff --git a/src/qcam/viewfinder.cpp b/src/qcam/viewfinder.cpp\n> index b8feabd5d189..2a35932e0b79 100644\n> --- a/src/qcam/viewfinder.cpp\n> +++ b/src/qcam/viewfinder.cpp\n> @@ -25,8 +25,7 @@ ViewFinder::~ViewFinder()\n> \tdelete image_;\n> }\n> \n> -void ViewFinder::display(const libcamera::FrameBuffer *buffer,\n> -\t\t\t MappedBuffer *map)\n> +void ViewFinder::render(libcamera::FrameBuffer *buffer, MappedBuffer *map)\n> {\n> \tif (buffer->planes().size() != 1) {\n> \t\tqWarning() << \"Multi-planar buffers are not supported\";\n> @@ -44,6 +43,8 @@ void ViewFinder::display(const libcamera::FrameBuffer *buffer,\n> \tconverter_.convert(static_cast(map->memory),\n> \t\t\t buffer->metadata().planes[0].bytesused, image_);\n> \tupdate();\n> +\n> +\trenderComplete(buffer);\n> }\n> \n> QImage ViewFinder::getCurrentImage()\n> diff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h\n> index 735a6b67e91d..784fcceda5bd 100644\n> --- a/src/qcam/viewfinder.h\n> +++ b/src/qcam/viewfinder.h\n> @@ -27,15 +27,20 @@ struct MappedBuffer {\n> \n> class ViewFinder : public QWidget\n> {\n> +\tQ_OBJECT\n> +\n> public:\n> \tViewFinder(QWidget *parent);\n> \t~ViewFinder();\n> \n> \tint setFormat(const libcamera::PixelFormat &format, const QSize &size);\n> -\tvoid display(const libcamera::FrameBuffer *buffer, MappedBuffer *map);\n> +\tvoid render(libcamera::FrameBuffer *buffer, MappedBuffer *map);\n> \n> \tQImage getCurrentImage();\n> \n> +Q_SIGNALS:\n> +\tvoid renderComplete(libcamera::FrameBuffer *buffer);\n> +\n> protected:\n> \tvoid paintEvent(QPaintEvent *) override;\n> \tQSize sizeHint() const override;\n>","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 E6D6460417\n\tfor ;\n\tMon, 23 Mar 2020 18:09:32 +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 5FFFC308;\n\tMon, 23 Mar 2020 18:09:32 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1584983372;\n\tbh=qCFG7xPedM/toDYdUZF55JDThyEaNdgT3mFnEZ/5h1w=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=peAgSE/DH6Hq9me74ml4KhcUjBJz6Ls2VIymL6oG0LNJ1Zrfh1ux16zv1LX48ugZ0\n\tt/01L/Qjgq6MXMpVe0ealT10O6MvgkCEtzb6LjuMHK8txl8Pq4jZ604nVfFtyoVJ3X\n\tSmrLYbILh88ChPAk/sJ0cFUx5q4++eRqsC6IqfXE=","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-16-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":"<394fe357-d382-153c-e781-168427b010da@ideasonboard.com>","Date":"Mon, 23 Mar 2020 17:09:29 +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-16-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH 15/21] qcam: viewfinder: Make the\n\tviewfinder hold a reference to a buffer","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 17:09:33 -0000"}}]