{"id":9287,"url":"https://patchwork.libcamera.org/api/1.1/patches/9287/?format=json","web_url":"https://patchwork.libcamera.org/patch/9287/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200810234528.1678143-2-niklas.soderlund@ragnatech.se>","date":"2020-08-10T23:45:27","name":"[libcamera-devel,1/2] libcamera: request: Declare a using directive for map of buffers","commit_ref":"dac8e9552ccdff137e717270468e584c2a9895b9","pull_url":null,"state":"accepted","archived":false,"hash":"506eae1b660f98d067d93cd9d4879a266ac0f47f","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/1.1/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9287/mbox/","series":[{"id":1213,"url":"https://patchwork.libcamera.org/api/1.1/series/1213/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1213","date":"2020-08-10T23:45:26","name":"libcamera: request: Make Stream pointer const","version":1,"mbox":"https://patchwork.libcamera.org/series/1213/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9287/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9287/checks/","tags":{},"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 8CBE0BD87E\n\tfor ;\n\tMon, 10 Aug 2020 23:45:38 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B8C6E610A9;\n\tTue, 11 Aug 2020 01:45:37 +0200 (CEST)","from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4002A60D5B\n\tfor ;\n\tTue, 11 Aug 2020 01:45:35 +0200 (CEST)","from bismarck.berto.se (p54ac52a8.dip0.t-ipconnect.de\n\t[84.172.82.168]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid 9536d807-db63-11ea-92dc-005056917a89;\n\tTue, 11 Aug 2020 01:45:34 +0200 (CEST)"],"X-Halon-ID":"9536d807-db63-11ea-92dc-005056917a89","Authorized-sender":"niklas.soderlund@fsdn.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 11 Aug 2020 01:45:27 +0200","Message-Id":"<20200810234528.1678143-2-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20200810234528.1678143-1-niklas.soderlund@ragnatech.se>","References":"<20200810234528.1678143-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 1/2] libcamera: request: Declare a using\n\tdirective 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","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Declare a using directive for the map of Stream to FrameBuffer. Update\nall users of Request::buffers() to use the new usage directive.\n\nSigned-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(-)","diff":"diff --git a/include/libcamera/request.h b/include/libcamera/request.h\nindex 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_;\ndiff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 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 =\ndiff --git a/src/cam/capture.cpp b/src/cam/capture.cpp\nindex 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();\ndiff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\nindex 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\ndiff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\nindex 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 \ndiff --git a/test/camera/buffer_import.cpp b/test/camera/buffer_import.cpp\nindex 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 \ndiff --git a/test/camera/capture.cpp b/test/camera/capture.cpp\nindex 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","prefixes":["libcamera-devel","1/2"]}