aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUmang Jain <umang.jain@ideasonboard.com>2021-10-19 17:18:02 +0530
committerUmang Jain <umang.jain@ideasonboard.com>2021-10-19 19:17:31 +0530
commita31c8f02b9965ebe5b7d4347e4316172e4b7e8d0 (patch)
tree52d828dd0c7ec11b7280f6c35c4884b80ef90baa
parent274607478c712e085633f4d24dba1165154fa5a8 (diff)
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>
-rw-r--r--src/android/camera_device.cpp9
-rw-r--r--src/android/camera_metadata.cpp8
-rw-r--r--src/android/camera_metadata.h4
3 files changed, 11 insertions, 10 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());
diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp
index 075b6a22..b3e515d2 100644
--- a/src/android/camera_metadata.cpp
+++ b/src/android/camera_metadata.cpp
@@ -33,7 +33,7 @@ CameraMetadata::CameraMetadata(const camera_metadata_t *metadata)
}
CameraMetadata::CameraMetadata(const CameraMetadata &other)
- : CameraMetadata(other.get())
+ : CameraMetadata(other.getMetadata())
{
}
@@ -51,7 +51,7 @@ CameraMetadata &CameraMetadata::operator=(const CameraMetadata &other)
if (metadata_)
free_camera_metadata(metadata_);
- metadata_ = clone_camera_metadata(other.get());
+ metadata_ = clone_camera_metadata(other.getMetadata());
valid_ = metadata_ != nullptr;
return *this;
@@ -220,12 +220,12 @@ bool CameraMetadata::updateEntry(uint32_t tag, const void *data, size_t count,
return false;
}
-camera_metadata_t *CameraMetadata::get()
+camera_metadata_t *CameraMetadata::getMetadata()
{
return valid_ ? metadata_ : nullptr;
}
-const camera_metadata_t *CameraMetadata::get() const
+const camera_metadata_t *CameraMetadata::getMetadata() const
{
return valid_ ? metadata_ : nullptr;
}
diff --git a/src/android/camera_metadata.h b/src/android/camera_metadata.h
index 60be416c..8555c7c3 100644
--- a/src/android/camera_metadata.h
+++ b/src/android/camera_metadata.h
@@ -85,8 +85,8 @@ public:
return updateEntry(tag, data, count, sizeof(T));
}
- camera_metadata_t *get();
- const camera_metadata_t *get() const;
+ camera_metadata_t *getMetadata();
+ const camera_metadata_t *getMetadata() const;
private:
bool resize(size_t count, size_t size);

Privacy Policy