summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHirokazu Honda <hiroh@chromium.org>2021-03-25 20:13:56 +0900
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-03-25 19:34:54 +0200
commit82b8151aa775bdf90bbe2f3073fd484e83ea3d51 (patch)
tree923906766c6f9229025e3267de876469320ad445
parentf101cc6878112d6587692913078f5656372c2e25 (diff)
android: CameraDevice: Mark getResultMetadata() const function
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>
-rw-r--r--src/android/camera_device.cpp10
-rw-r--r--src/android/camera_device.h3
2 files changed, 7 insertions, 6 deletions
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index 5fbf6f82..ae693664 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -1924,7 +1924,7 @@ void CameraDevice::requestComplete(Request *request)
* pipeline handlers) timestamp in the Request itself.
*/
uint64_t timestamp = buffers.begin()->second->metadata().timestamp;
- resultMetadata = getResultMetadata(descriptor, timestamp);
+ resultMetadata = getResultMetadata(*descriptor, timestamp);
/* Handle any JPEG compression. */
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.
*/
std::unique_ptr<CameraMetadata>
-CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,
- int64_t timestamp)
+CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor,
+ int64_t timestamp) const
{
- const ControlList &metadata = descriptor->request_->metadata();
- const CameraMetadata &settings = descriptor->settings_;
+ const ControlList &metadata = descriptor.request_->metadata();
+ const CameraMetadata &settings = descriptor.settings_;
camera_metadata_ro_entry_t entry;
bool found;
diff --git a/src/android/camera_device.h b/src/android/camera_device.h
index 09c395ff..11bdfec8 100644
--- a/src/android/camera_device.h
+++ b/src/android/camera_device.h
@@ -102,7 +102,8 @@ private:
libcamera::PixelFormat toPixelFormat(int format) const;
int processControls(Camera3RequestDescriptor *descriptor);
std::unique_ptr<CameraMetadata> getResultMetadata(
- Camera3RequestDescriptor *descriptor, int64_t timestamp);
+ const Camera3RequestDescriptor &descriptor,
+ int64_t timestamp) const;
unsigned int id_;
camera3_device_t camera3Device_;