Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-13 15:29:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

android: camera_metadata: Rename get() to getMetadata()

Browse source 
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>
This commit is contained in:
Umang Jain 2021-10-19 17:18:02 +05:30
parent 274607478c
commit a31c8f02b9
3 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/android/camera_device.cpp
View file

@ -440,7 +440,7 @@ void CameraDevice::setCallbacks(const camera3_callback_ops_t *callbacks)
const camera_metadata_t *CameraDevice::getStaticMetadata() 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); auto it = requestTemplates_.find(type);
if (it != requestTemplates_.end()) if (it != requestTemplates_.end())
return it->second->get(); return it->second->getMetadata();
/* Use the capture intent matching the requested template type. */ /* Use the capture intent matching the requested template type. */
std::unique_ptr<CameraMetadata> requestTemplate; std::unique_ptr<CameraMetadata> requestTemplate;
@ -496,7 +496,7 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)
captureIntent); captureIntent);
requestTemplates_[type] = std::move(requestTemplate); 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_; captureResult.frame_number = descriptor->frameNumber_;
if (descriptor->resultMetadata_) if (descriptor->resultMetadata_)
captureResult.result = descriptor->resultMetadata_->get(); captureResult.result =
descriptor->resultMetadata_->getMetadata();
std::vector<camera3_stream_buffer_t> resultBuffers; std::vector<camera3_stream_buffer_t> resultBuffers;
resultBuffers.reserve(descriptor->buffers_.size()); resultBuffers.reserve(descriptor->buffers_.size());

8
src/android/camera_metadata.cpp
View file

@ -33,7 +33,7 @@ CameraMetadata::CameraMetadata(const camera_metadata_t *metadata)
} }
CameraMetadata::CameraMetadata(const CameraMetadata &other) CameraMetadata::CameraMetadata(const CameraMetadata &other)
: CameraMetadata(other.get()) : CameraMetadata(other.getMetadata())
{ {
} }
@ -51,7 +51,7 @@ CameraMetadata &CameraMetadata::operator=(const CameraMetadata &other)
if (metadata_) if (metadata_)
free_camera_metadata(metadata_); free_camera_metadata(metadata_);
metadata_ = clone_camera_metadata(other.get()); metadata_ = clone_camera_metadata(other.getMetadata());
valid_ = metadata_ != nullptr; valid_ = metadata_ != nullptr;
return *this; return *this;
@ -220,12 +220,12 @@ bool CameraMetadata::updateEntry(uint32_t tag, const void *data, size_t count,
return false; return false;
} }
camera_metadata_t *CameraMetadata::get() camera_metadata_t *CameraMetadata::getMetadata()
{ {
return valid_ ? metadata_ : nullptr; return valid_ ? metadata_ : nullptr;
} }
const camera_metadata_t *CameraMetadata::get() const const camera_metadata_t *CameraMetadata::getMetadata() const
{ {
return valid_ ? metadata_ : nullptr; return valid_ ? metadata_ : nullptr;
} }

4
src/android/camera_metadata.h
View file

@ -85,8 +85,8 @@ public:
return updateEntry(tag, data, count, sizeof(T)); return updateEntry(tag, data, count, sizeof(T));
} }
camera_metadata_t *get(); camera_metadata_t *getMetadata();
const camera_metadata_t *get() const; const camera_metadata_t *getMetadata() const;
private: private:
bool resize(size_t count, size_t size); bool resize(size_t count, size_t size);