From 82b8151aa775bdf90bbe2f3073fd484e83ea3d51 Mon Sep 17 00:00:00 2001 From: Hirokazu Honda Date: Thu, 25 Mar 2021 20:13:56 +0900 Subject: android: CameraDevice: Mark getResultMetadata() const function CameraDevice::getResultMetadata() doesn't change either |descriptor| and member variables. It should be marked as a const function and |descriptor| should be passed with const lvalue reference. Signed-off-by: Hirokazu Honda Reviewed-by: Jacopo Mondi Reviewed-by: Laurent Pinchart Signed-off-by: Laurent Pinchart --- src/android/camera_device.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/android/camera_device.cpp') diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 5fbf6f82..ae693664 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1924,7 +1924,7 @@ void CameraDevice::requestComplete(Request *request) * pipeline handlers) timestamp in the Request itself. */ uint64_t timestamp = buffers.begin()->second->metadata().timestamp; - resultMetadata = getResultMetadata(descriptor, timestamp); + resultMetadata = getResultMetadata(*descriptor, timestamp); /* Handle any JPEG compression. */ for (camera3_stream_buffer_t &buffer : descriptor->buffers_) { @@ -2030,11 +2030,11 @@ void CameraDevice::notifyError(uint32_t frameNumber, camera3_stream_t *stream) * Produce a set of fixed result metadata. */ std::unique_ptr -CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor, - int64_t timestamp) +CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor, + int64_t timestamp) const { - const ControlList &metadata = descriptor->request_->metadata(); - const CameraMetadata &settings = descriptor->settings_; + const ControlList &metadata = descriptor.request_->metadata(); + const CameraMetadata &settings = descriptor.settings_; camera_metadata_ro_entry_t entry; bool found; -- cgit v1.2.1