From a31c8f02b9965ebe5b7d4347e4316172e4b7e8d0 Mon Sep 17 00:00:00 2001 From: Umang Jain Date: Tue, 19 Oct 2021 17:18:02 +0530 Subject: android: camera_metadata: Rename get() to getMetadata() Rename CameraMetadata::get() to CameraMetadata::getMetadata() to avoid confusion with std::unique_ptr::get() when CameraMetadata is used with a std::unique_ptr. No functional changes intended in this patch. Reviewed-by: Laurent Pinchart Reviewed-by: Jacopo Mondi Signed-off-by: Umang Jain --- src/android/camera_device.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/android/camera_device.cpp') diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 0a2d3826..ea676409 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -440,7 +440,7 @@ void CameraDevice::setCallbacks(const camera3_callback_ops_t *callbacks) const camera_metadata_t *CameraDevice::getStaticMetadata() { - return capabilities_.staticMetadata()->get(); + return capabilities_.staticMetadata()->getMetadata(); } /* @@ -450,7 +450,7 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type) { auto it = requestTemplates_.find(type); if (it != requestTemplates_.end()) - return it->second->get(); + return it->second->getMetadata(); /* Use the capture intent matching the requested template type. */ std::unique_ptr requestTemplate; @@ -496,7 +496,7 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type) captureIntent); requestTemplates_[type] = std::move(requestTemplate); - return requestTemplates_[type]->get(); + return requestTemplates_[type]->getMetadata(); } /* @@ -1171,7 +1171,8 @@ void CameraDevice::sendCaptureResults() captureResult.frame_number = descriptor->frameNumber_; if (descriptor->resultMetadata_) - captureResult.result = descriptor->resultMetadata_->get(); + captureResult.result = + descriptor->resultMetadata_->getMetadata(); std::vector resultBuffers; resultBuffers.reserve(descriptor->buffers_.size()); -- cgit v1.2.1