[{"id":11976,"web_url":"https://patchwork.libcamera.org/comment/11976/","msgid":"","date":"2020-08-11T12:58:34","subject":"Re: [libcamera-devel] [PATCH 1/2] libcamera: request: Declare a\n\tusing directive for map of buffers","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Niklas,\n\nOn 11/08/2020 00:45, Niklas Söderlund wrote:\n> Declare a using directive for the map of Stream to FrameBuffer. Update\n> all users of Request::buffers() to use the new usage directive.\n\nI like this because it gives a 'named purpose' to the extended template\ntypes that we use, but I know Laurent sometimes prefers to see the\nunderlying types.\n\nReviewed-by: Kieran Bingham \n\n> Signed-off-by: Niklas Söderlund \n> ---\n> include/libcamera/request.h | 6 ++++--\n> src/android/camera_device.cpp | 2 +-\n> src/cam/capture.cpp | 2 +-\n> src/libcamera/request.cpp | 5 +++++\n> src/qcam/main_window.h | 4 ++--\n> test/camera/buffer_import.cpp | 2 +-\n> test/camera/capture.cpp | 2 +-\n> 7 files changed, 15 insertions(+), 8 deletions(-)\n> \n> diff --git a/include/libcamera/request.h b/include/libcamera/request.h\n> index eded68318b7dbb3c..e74f56a7d6415315 100644\n> --- a/include/libcamera/request.h\n> +++ b/include/libcamera/request.h\n> @@ -31,6 +31,8 @@ public:\n> \t\tRequestCancelled,\n> \t};\n> \n> +\tusing BufferMap = std::map;\n> +\n> \tRequest(Camera *camera, uint64_t cookie = 0);\n> \tRequest(const Request &) = delete;\n> \tRequest &operator=(const Request &) = delete;\n> @@ -38,7 +40,7 @@ public:\n> \n> \tControlList &controls() { return *controls_; }\n> \tControlList &metadata() { return *metadata_; }\n> -\tconst std::map &buffers() const { return bufferMap_; }\n> +\tconst BufferMap &buffers() const { return bufferMap_; }\n> \tint addBuffer(Stream *stream, FrameBuffer *buffer);\n> \tFrameBuffer *findBuffer(Stream *stream) const;\n> \n> @@ -58,7 +60,7 @@ private:\n> \tCameraControlValidator *validator_;\n> \tControlList *controls_;\n> \tControlList *metadata_;\n> -\tstd::map bufferMap_;\n> +\tBufferMap bufferMap_;\n> \tstd::unordered_set pending_;\n> \n> \tconst uint64_t cookie_;\n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index d9183501228f4642..3419236a061cba57 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -1371,7 +1371,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n> \n> void CameraDevice::requestComplete(Request *request)\n> {\n> -\tconst std::map &buffers = request->buffers();\n> +\tconst Request::BufferMap &buffers = request->buffers();\n> \tcamera3_buffer_status status = CAMERA3_BUFFER_STATUS_OK;\n> \tstd::unique_ptr resultMetadata;\n> \tCamera3RequestDescriptor *descriptor =\n> diff --git a/src/cam/capture.cpp b/src/cam/capture.cpp\n> index 3d8e89d52c7ab68d..0720376983470f2f 100644\n> --- a/src/cam/capture.cpp\n> +++ b/src/cam/capture.cpp\n> @@ -157,7 +157,7 @@ void Capture::requestComplete(Request *request)\n> \tif (request->status() == Request::RequestCancelled)\n> \t\treturn;\n> \n> -\tconst std::map &buffers = request->buffers();\n> +\tconst Request::BufferMap &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> diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\n> index f3753514131ae394..d5f11e8c43c32766 100644\n> --- a/src/libcamera/request.cpp\n> +++ b/src/libcamera/request.cpp\n> @@ -37,6 +37,11 @@ LOG_DEFINE_CATEGORY(Request)\n> * The request has been cancelled due to capture stop\n> */\n> \n> +/**\n> + * \\typedef Request::BufferMap\n> + * \\brief A map of Stream to FrameBuffer pointers\n> + */\n> +\n> /**\n> * \\class Request\n> * \\brief A frame capture request\n> diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\n> index 4606fe487ad49777..6e1bcd76a2438b4c 100644\n> --- a/src/qcam/main_window.h\n> +++ b/src/qcam/main_window.h\n> @@ -47,13 +47,13 @@ public:\n> \t{\n> \t}\n> \n> -\tCaptureRequest(const std::map &buffers,\n> +\tCaptureRequest(const Request::BufferMap &buffers,\n> \t\t const ControlList &metadata)\n> \t\t: buffers_(buffers), metadata_(metadata)\n> \t{\n> \t}\n> \n> -\tstd::map buffers_;\n> +\tRequest::BufferMap buffers_;\n> \tControlList metadata_;\n> };\n> \n> diff --git a/test/camera/buffer_import.cpp b/test/camera/buffer_import.cpp\n> index 46e03746213912aa..726d2cb2fe757066 100644\n> --- a/test/camera/buffer_import.cpp\n> +++ b/test/camera/buffer_import.cpp\n> @@ -46,7 +46,7 @@ protected:\n> \t\tif (request->status() != Request::RequestComplete)\n> \t\t\treturn;\n> \n> -\t\tconst std::map &buffers = request->buffers();\n> +\t\tconst Request::BufferMap &buffers = request->buffers();\n> \n> \t\tcompleteRequestsCount_++;\n> \n> diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp\n> index ea84daeef196e349..ae572eb955753151 100644\n> --- a/test/camera/capture.cpp\n> +++ b/test/camera/capture.cpp\n> @@ -39,7 +39,7 @@ protected:\n> \t\tif (request->status() != Request::RequestComplete)\n> \t\t\treturn;\n> \n> -\t\tconst std::map &buffers = request->buffers();\n> +\t\tconst Request::BufferMap &buffers = request->buffers();\n> \n> \t\tcompleteRequestsCount_++;\n> \n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id B63C2BD87C\n\tfor ;\n\tTue, 11 Aug 2020 12:58:39 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2B9BE60DCA;\n\tTue, 11 Aug 2020 14:58:39 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 19F1F6055A\n\tfor ;\n\tTue, 11 Aug 2020 14:58:38 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7817A9A8;\n\tTue, 11 Aug 2020 14:58:37 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"WCdpAzFf\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1597150717;\n\tbh=H85IBvjG/HHVBHyP9UUB5m4ygI+HKx6C342DOxGCvHk=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=WCdpAzFfLy+aNsAY/ad9N1zWIX7BiwPO5tySmnsFjV0IhkeSBwGyO45tyNxQYTcOG\n\t0Wy0dOZRmCu2DPIkUx9xepzNlS3pj8Y7e/GzrG6J3J912LlfZ9c/ukWtZaWFlYBZRM\n\tKEtEebGevRe1JcUtSqgTZAxWU66CIVxRQfgsPRWk=","To":"=?utf-8?q?Niklas_S=C3=B6derlund?= ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200810234528.1678143-1-niklas.soderlund@ragnatech.se>\n\t<20200810234528.1678143-2-niklas.soderlund@ragnatech.se>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"","Date":"Tue, 11 Aug 2020 13:58:34 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20200810234528.1678143-2-niklas.soderlund@ragnatech.se>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH 1/2] libcamera: request: Declare a\n\tusing directive for map of buffers","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","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]