From f101cc6878112d6587692913078f5656372c2e25 Mon Sep 17 00:00:00 2001 From: Hirokazu Honda Date: Wed, 24 Mar 2021 16:07:57 +0900 Subject: android: CameraDevice: Manage requestTemplates_ with std::unique_ptr CameraMetadata stored in requestTemplates_ in CameraDevice is not necessary to be a raw pointer. This reduces the manual new/delete code by changing the type to std::unique_ptr. Signed-off-by: Hirokazu Honda Reviewed-by: Laurent Pinchart Signed-off-by: Laurent Pinchart --- src/android/camera_device.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/android/camera_device.h') diff --git a/src/android/camera_device.h b/src/android/camera_device.h index cea82b24..09c395ff 100644 --- a/src/android/camera_device.h +++ b/src/android/camera_device.h @@ -97,8 +97,8 @@ private: libcamera::FrameBuffer *createFrameBuffer(const buffer_handle_t camera3buffer); void notifyShutter(uint32_t frameNumber, uint64_t timestamp); void notifyError(uint32_t frameNumber, camera3_stream_t *stream); - CameraMetadata *requestTemplatePreview(); - CameraMetadata *requestTemplateVideo(); + std::unique_ptr requestTemplatePreview(); + std::unique_ptr requestTemplateVideo(); libcamera::PixelFormat toPixelFormat(int format) const; int processControls(Camera3RequestDescriptor *descriptor); std::unique_ptr getResultMetadata( @@ -114,7 +114,7 @@ private: std::unique_ptr config_; std::unique_ptr staticMetadata_; - std::map requestTemplates_; + std::map> requestTemplates_; const camera3_callback_ops_t *callbacks_; std::vector streamConfigurations_; -- cgit v1.2.1