From f7ddfd451775afd5f7c95771ce2a6b80b703836b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= Date: Mon, 21 Oct 2019 20:01:19 +0200 Subject: libcamera: camera: Remove explicit stream to buffer map in requestCompleted signal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The stream to buffer map in the requestCompleted signal is taken directly from the request which is part of the same signal. Remove the map as it can be fetched directly from the request. Signed-off-by: Niklas Söderlund Reviewed-by: Jacopo Mondi Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- src/android/camera_device.cpp | 4 ++-- src/android/camera_device.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/android') diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 897f5458..065e0292 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -769,9 +769,9 @@ error: delete descriptor; } -void CameraDevice::requestComplete(Request *request, - const std::map &buffers) +void CameraDevice::requestComplete(Request *request) { + const std::map &buffers = request->buffers(); Buffer *libcameraBuffer = buffers.begin()->second; camera3_buffer_status status = CAMERA3_BUFFER_STATUS_OK; std::unique_ptr resultMetadata; diff --git a/src/android/camera_device.h b/src/android/camera_device.h index 2105b5b9..caa617dc 100644 --- a/src/android/camera_device.h +++ b/src/android/camera_device.h @@ -34,8 +34,7 @@ public: const camera_metadata_t *constructDefaultRequestSettings(int type); int configureStreams(camera3_stream_configuration_t *stream_list); void processCaptureRequest(camera3_capture_request_t *request); - void requestComplete(libcamera::Request *request, - const std::map &buffers); + void requestComplete(libcamera::Request *request); private: struct Camera3RequestDescriptor { -- cgit v1.2.1