[{"id":2999,"web_url":"https://patchwork.libcamera.org/comment/2999/","msgid":"<20191106085705.2gk6baq3eju7bm6c@uno.localdomain>","date":"2019-11-06T08:57:05","subject":"Re: [libcamera-devel] [PATCH 04/10] libcamera: camera: Remove\n\texplicit stream to buffer map in requestCompleted signal","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Niklas,\n\nOn Mon, Oct 28, 2019 at 03:22:18AM +0100, Niklas Söderlund wrote:\n> The stream to buffer map in the requestCompleted signal is taken\n> directly from the request which is part of the same signal. Remove the\n> map as it can be fetched directly from the request.\n\nPlease be aware this breaks teh android HAL. You should update that\none too\n\nThanks\n j\n\n>\n> Signed-off-by: Niklas Söderlund \n> ---\n> include/libcamera/camera.h | 2 +-\n> src/cam/capture.cpp | 4 +++-\n> src/cam/capture.h | 3 +--\n> src/libcamera/camera.cpp | 2 +-\n> src/qcam/main_window.cpp | 5 +++--\n> src/qcam/main_window.h | 3 +--\n> test/camera/capture.cpp | 4 +++-\n> 7 files changed, 13 insertions(+), 10 deletions(-)\n>\n> diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h\n> index 21fac550f4121fdc..268d2d37ccac8b71 100644\n> --- a/include/libcamera/camera.h\n> +++ b/include/libcamera/camera.h\n> @@ -79,7 +79,7 @@ public:\n> \tconst std::string &name() const;\n>\n> \tSignal bufferCompleted;\n> -\tSignal &> requestCompleted;\n> +\tSignal requestCompleted;\n> \tSignal disconnected;\n>\n> \tint acquire();\n> diff --git a/src/cam/capture.cpp b/src/cam/capture.cpp\n> index 0d7854d674e0a78d..27332df1d55a5c2d 100644\n> --- a/src/cam/capture.cpp\n> +++ b/src/cam/capture.cpp\n> @@ -133,11 +133,13 @@ int Capture::capture(EventLoop *loop)\n> \treturn ret;\n> }\n>\n> -void Capture::requestComplete(Request *request, const std::map &buffers)\n> +void Capture::requestComplete(Request *request)\n> {\n> \tif (request->status() == Request::RequestCancelled)\n> \t\treturn;\n>\n> +\tconst std::map &buffers = request->buffers();\n> +\n> \tstd::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();\n> \tdouble fps = std::chrono::duration_cast(now - last_).count();\n> \tfps = last_ != std::chrono::steady_clock::time_point() && fps\n> diff --git a/src/cam/capture.h b/src/cam/capture.h\n> index ee0dc421111197c1..4d396afb8c771a74 100644\n> --- a/src/cam/capture.h\n> +++ b/src/cam/capture.h\n> @@ -28,8 +28,7 @@ public:\n> private:\n> \tint capture(EventLoop *loop);\n>\n> -\tvoid requestComplete(libcamera::Request *request,\n> -\t\t\t const std::map &buffers);\n> +\tvoid requestComplete(libcamera::Request *request);\n>\n> \tlibcamera::Camera *camera_;\n> \tlibcamera::CameraConfiguration *config_;\n> diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\n> index 76c737cb93813115..e810fb725d81350d 100644\n> --- a/src/libcamera/camera.cpp\n> +++ b/src/libcamera/camera.cpp\n> @@ -919,7 +919,7 @@ void Camera::requestComplete(Request *request)\n> \t\t\tstream->unmapBuffer(buffer);\n> \t}\n>\n> -\trequestCompleted.emit(request, request->buffers());\n> +\trequestCompleted.emit(request);\n> \tdelete request;\n> }\n>\n> diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\n> index 3d56309227235fec..cca7365ae75687f9 100644\n> --- a/src/qcam/main_window.cpp\n> +++ b/src/qcam/main_window.cpp\n> @@ -248,12 +248,13 @@ void MainWindow::stopCapture()\n> \tsetWindowTitle(title_);\n> }\n>\n> -void MainWindow::requestComplete(Request *request,\n> -\t\t\t\t const std::map &buffers)\n> +void MainWindow::requestComplete(Request *request)\n> {\n> \tif (request->status() == Request::RequestCancelled)\n> \t\treturn;\n>\n> +\tconst std::map &buffers = request->buffers();\n> +\n> \tframesCaptured_++;\n>\n> \tBuffer *buffer = buffers.begin()->second;\n> diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\n> index 30dd8743104d75e0..78511581a8d5c025 100644\n> --- a/src/qcam/main_window.h\n> +++ b/src/qcam/main_window.h\n> @@ -49,8 +49,7 @@ private:\n> \tint startCapture();\n> \tvoid stopCapture();\n>\n> -\tvoid requestComplete(Request *request,\n> -\t\t\t const std::map &buffers);\n> +\tvoid requestComplete(Request *request);\n> \tint display(Buffer *buffer);\n>\n> \tQString title_;\n> diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp\n> index 791ccad15f7042f9..83f974749affd3cd 100644\n> --- a/test/camera/capture.cpp\n> +++ b/test/camera/capture.cpp\n> @@ -27,11 +27,13 @@ protected:\n> \t\tcompleteBuffersCount_++;\n> \t}\n>\n> -\tvoid requestComplete(Request *request, const std::map &buffers)\n> +\tvoid requestComplete(Request *request)\n> \t{\n> \t\tif (request->status() != Request::RequestComplete)\n> \t\t\treturn;\n>\n> +\t\tconst std::map &buffers = request->buffers();\n> +\n> \t\tcompleteRequestsCount_++;\n>\n> \t\t/* Create a new request. */\n> --\n> 2.23.0\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net\n\t[217.70.183.194])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5A1E060C41\n\tfor ;\n\tWed, 6 Nov 2019 09:55:09 +0100 (CET)","from uno.localdomain (2-224-242-101.ip172.fastwebnet.it\n\t[2.224.242.101]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay2-d.mail.gandi.net (Postfix) with ESMTPSA id D74F44001A;\n\tWed, 6 Nov 2019 08:55:08 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","Date":"Wed, 6 Nov 2019 09:57:05 +0100","From":"Jacopo Mondi ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20191106085705.2gk6baq3eju7bm6c@uno.localdomain>","References":"<20191028022224.795355-1-niklas.soderlund@ragnatech.se>\n\t<20191028022224.795355-5-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"wabvca3if5cjjobf\"","Content-Disposition":"inline","In-Reply-To":"<20191028022224.795355-5-niklas.soderlund@ragnatech.se>","User-Agent":"NeoMutt/20180716","Subject":"Re: [libcamera-devel] [PATCH 04/10] libcamera: camera: Remove\n\texplicit stream to buffer map in requestCompleted signal","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":"Wed, 06 Nov 2019 08:55:09 -0000"}},{"id":3049,"web_url":"https://patchwork.libcamera.org/comment/3049/","msgid":"<20191118112336.GF4724@pendragon.ideasonboard.com>","date":"2019-11-18T11:23:36","subject":"Re: [libcamera-devel] [PATCH 04/10] libcamera: camera: Remove\n\texplicit stream to buffer map in requestCompleted signal","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 Mon, Oct 28, 2019 at 03:22:18AM +0100, Niklas Söderlund wrote:\n> The stream to buffer map in the requestCompleted signal is taken\n> directly from the request which is part of the same signal. Remove the\n> map as it can be fetched directly from the request.\n> \n> Signed-off-by: Niklas Söderlund \n> ---\n> include/libcamera/camera.h | 2 +-\n> src/cam/capture.cpp | 4 +++-\n> src/cam/capture.h | 3 +--\n> src/libcamera/camera.cpp | 2 +-\n> src/qcam/main_window.cpp | 5 +++--\n> src/qcam/main_window.h | 3 +--\n> test/camera/capture.cpp | 4 +++-\n> 7 files changed, 13 insertions(+), 10 deletions(-)\n> \n> diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h\n> index 21fac550f4121fdc..268d2d37ccac8b71 100644\n> --- a/include/libcamera/camera.h\n> +++ b/include/libcamera/camera.h\n> @@ -79,7 +79,7 @@ public:\n> \tconst std::string &name() const;\n> \n> \tSignal bufferCompleted;\n> -\tSignal &> requestCompleted;\n> +\tSignal requestCompleted;\n\nThis was the only user of std::map, you can drop the include.\n\n> \tSignal disconnected;\n> \n> \tint acquire();\n> diff --git a/src/cam/capture.cpp b/src/cam/capture.cpp\n> index 0d7854d674e0a78d..27332df1d55a5c2d 100644\n> --- a/src/cam/capture.cpp\n> +++ b/src/cam/capture.cpp\n> @@ -133,11 +133,13 @@ int Capture::capture(EventLoop *loop)\n> \treturn ret;\n> }\n> \n> -void Capture::requestComplete(Request *request, const std::map &buffers)\n> +void Capture::requestComplete(Request *request)\n> {\n> \tif (request->status() == Request::RequestCancelled)\n> \t\treturn;\n> \n> +\tconst std::map &buffers = request->buffers();\n> +\n> \tstd::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();\n> \tdouble fps = std::chrono::duration_cast(now - last_).count();\n> \tfps = last_ != std::chrono::steady_clock::time_point() && fps\n> diff --git a/src/cam/capture.h b/src/cam/capture.h\n> index ee0dc421111197c1..4d396afb8c771a74 100644\n> --- a/src/cam/capture.h\n> +++ b/src/cam/capture.h\n> @@ -28,8 +28,7 @@ public:\n> private:\n> \tint capture(EventLoop *loop);\n> \n> -\tvoid requestComplete(libcamera::Request *request,\n> -\t\t\t const std::map &buffers);\n> +\tvoid requestComplete(libcamera::Request *request);\n> \n> \tlibcamera::Camera *camera_;\n> \tlibcamera::CameraConfiguration *config_;\n> diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\n> index 76c737cb93813115..e810fb725d81350d 100644\n> --- a/src/libcamera/camera.cpp\n> +++ b/src/libcamera/camera.cpp\n> @@ -919,7 +919,7 @@ void Camera::requestComplete(Request *request)\n> \t\t\tstream->unmapBuffer(buffer);\n> \t}\n> \n> -\trequestCompleted.emit(request, request->buffers());\n> +\trequestCompleted.emit(request);\n> \tdelete request;\n> }\n> \n> diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\n> index 3d56309227235fec..cca7365ae75687f9 100644\n> --- a/src/qcam/main_window.cpp\n> +++ b/src/qcam/main_window.cpp\n> @@ -248,12 +248,13 @@ void MainWindow::stopCapture()\n> \tsetWindowTitle(title_);\n> }\n> \n> -void MainWindow::requestComplete(Request *request,\n> -\t\t\t\t const std::map &buffers)\n> +void MainWindow::requestComplete(Request *request)\n> {\n> \tif (request->status() == Request::RequestCancelled)\n> \t\treturn;\n> \n> +\tconst std::map &buffers = request->buffers();\n> +\n> \tframesCaptured_++;\n> \n> \tBuffer *buffer = buffers.begin()->second;\n> diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\n> index 30dd8743104d75e0..78511581a8d5c025 100644\n> --- a/src/qcam/main_window.h\n> +++ b/src/qcam/main_window.h\n> @@ -49,8 +49,7 @@ private:\n> \tint startCapture();\n> \tvoid stopCapture();\n> \n> -\tvoid requestComplete(Request *request,\n> -\t\t\t const std::map &buffers);\n> +\tvoid requestComplete(Request *request);\n\nSame here, you can drop the #include .\n\nApart from this, and with the HAL fixed,\n\nReviewed-by: Laurent Pinchart \n\n> \tint display(Buffer *buffer);\n> \n> \tQString title_;\n> diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp\n> index 791ccad15f7042f9..83f974749affd3cd 100644\n> --- a/test/camera/capture.cpp\n> +++ b/test/camera/capture.cpp\n> @@ -27,11 +27,13 @@ protected:\n> \t\tcompleteBuffersCount_++;\n> \t}\n> \n> -\tvoid requestComplete(Request *request, const std::map &buffers)\n> +\tvoid requestComplete(Request *request)\n> \t{\n> \t\tif (request->status() != Request::RequestComplete)\n> \t\t\treturn;\n> \n> +\t\tconst std::map &buffers = request->buffers();\n> +\n> \t\tcompleteRequestsCount_++;\n> \n> \t\t/* Create a new request. */","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 02D4560F1C\n\tfor ;\n\tMon, 18 Nov 2019 12:23:40 +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 7A0C0563;\n\tMon, 18 Nov 2019 12:23:40 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1574076220;\n\tbh=PuoZL+iiTLVntXsIMSwShVYEyCcPZFBzolAVk0vQXZ4=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=IJ4x5Oat81i2KX7kBls2s4Ez0y1km6ASfKP7mZNBUK1m2zyrhL4F6/JctiOc1p5Fl\n\tAfyeEMJzxiSRbFRMWdgcpoiBTikDdB2CcsxG82wcpt++1lq66EtgBuy27TeJBysOig\n\tBBz1PZqvqsDVWMa/wS7MgDMxg0esZIL8bNNtBOog=","Date":"Mon, 18 Nov 2019 13:23:36 +0200","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20191118112336.GF4724@pendragon.ideasonboard.com>","References":"<20191028022224.795355-1-niklas.soderlund@ragnatech.se>\n\t<20191028022224.795355-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":"<20191028022224.795355-5-niklas.soderlund@ragnatech.se>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH 04/10] libcamera: camera: Remove\n\texplicit stream to buffer map in requestCompleted signal","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, 18 Nov 2019 11:23:41 -0000"}}]