NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

android: CameraDevice: Mark getResultMetadata() const function

Browse source 
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 <hiroh@chromium.org>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Hirokazu Honda 2021-03-25 20:13:56 +09:00 • committed by Laurent Pinchart
parent f101cc6878
commit 82b8151aa7
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/android/camera_device.cpp
View file

@ -1924,7 +1924,7 @@ void CameraDevice::requestComplete(Request *request)
* pipeline handlers) timestamp in the Request itself. * pipeline handlers) timestamp in the Request itself.
*/ */
uint64_t timestamp = buffers.begin()->second->metadata().timestamp; uint64_t timestamp = buffers.begin()->second->metadata().timestamp;
resultMetadata = getResultMetadata(descriptor, timestamp); resultMetadata = getResultMetadata(*descriptor, timestamp);
/* Handle any JPEG compression. */ /* Handle any JPEG compression. */
for (camera3_stream_buffer_t &buffer : descriptor->buffers_) { 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. * Produce a set of fixed result metadata.
*/ */
std::unique_ptr<CameraMetadata> std::unique_ptr<CameraMetadata>
CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor, CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor,
int64_t timestamp) int64_t timestamp) const
{ {
const ControlList &metadata = descriptor->request_->metadata(); const ControlList &metadata = descriptor.request_->metadata();
const CameraMetadata &settings = descriptor->settings_; const CameraMetadata &settings = descriptor.settings_;
camera_metadata_ro_entry_t entry; camera_metadata_ro_entry_t entry;
bool found; bool found;

3
src/android/camera_device.h
View file

@ -102,7 +102,8 @@ private:
libcamera::PixelFormat toPixelFormat(int format) const; libcamera::PixelFormat toPixelFormat(int format) const;
int processControls(Camera3RequestDescriptor *descriptor); int processControls(Camera3RequestDescriptor *descriptor);
std::unique_ptr<CameraMetadata> getResultMetadata( std::unique_ptr<CameraMetadata> getResultMetadata(
Camera3RequestDescriptor *descriptor, int64_t timestamp); const Camera3RequestDescriptor &descriptor,
int64_t timestamp) const;
unsigned int id_; unsigned int id_;
camera3_device_t camera3Device_; camera3_device_t camera3Device_;