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 <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>

1 files changed, 5 insertions, 4 deletions

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<CameraMetadata> 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<camera3_stream_buffer_t> resultBuffers;
 		resultBuffers.reserve(descriptor->buffers_.size());