diff options
| author | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2019-10-21 20:01:19 +0200 |
|---|---|---|
| committer | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2019-11-19 18:30:26 +0100 |
| commit | f7ddfd451775afd5f7c95771ce2a6b80b703836b (patch) | |
| tree | 714afe072f5e5509e35920742813c4b71128983a /src/android | |
| parent | 40888cfdcee71b0f8daab96a0bfdda7302be02ae (diff) | |
libcamera: camera: Remove explicit stream to buffer map in requestCompleted signal
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 <niklas.soderlund@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/camera_device.cpp | 4 | ||||
| -rw-r--r-- | src/android/camera_device.h | 3 |
2 files changed, 3 insertions, 4 deletions
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<Stream *, Buffer *> &buffers) +void CameraDevice::requestComplete(Request *request) { + const std::map<Stream *, Buffer *> &buffers = request->buffers(); Buffer *libcameraBuffer = buffers.begin()->second; camera3_buffer_status status = CAMERA3_BUFFER_STATUS_OK; std::unique_ptr<CameraMetadata> 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<libcamera::Stream *, libcamera::Buffer *> &buffers); + void requestComplete(libcamera::Request *request); private: struct Camera3RequestDescriptor { |