[libcamera-devel,v2,3/6] andrdid: camera_device: Store const templates

Message ID 20200725144058.129388-4-jacopo@jmondi.org
State Accepted
Headers show
Series
  • android: camera_device: Generate correct preview template
Related show

Commit Message

Jacopo Mondi July 25, 2020, 2:40 p.m. UTC
The request capture templates stored in the
CameraDevice::requestTemplates_ should not be modified once created.

Store a const pointer to the request templates in the class member
map.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.comR
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
---
 src/android/camera_device.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Laurent Pinchart July 25, 2020, 4:17 p.m. UTC | #1
Hi Jacopo,

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

On Sat, Jul 25, 2020 at 04:40:55PM +0200, Jacopo Mondi wrote:
> The request capture templates stored in the
> CameraDevice::requestTemplates_ should not be modified once created.
> 
> Store a const pointer to the request templates in the class member
> map.
> 
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.comR

s/comR/com>/

> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
> ---
>  src/android/camera_device.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/android/camera_device.h b/src/android/camera_device.h
> index 5b8b9c3e26e2..af1b58ab6b4e 100644
> --- a/src/android/camera_device.h
> +++ b/src/android/camera_device.h
> @@ -95,7 +95,7 @@ private:
>  	std::unique_ptr<libcamera::CameraConfiguration> config_;
>  
>  	CameraMetadata *staticMetadata_;
> -	std::map<unsigned int, CameraMetadata *> requestTemplates_;
> +	std::map<unsigned int, const CameraMetadata *> requestTemplates_;
>  	const camera3_callback_ops_t *callbacks_;
>  
>  	std::vector<Camera3StreamConfiguration> streamConfigurations_;

Patch

diff --git a/src/android/camera_device.h b/src/android/camera_device.h
index 5b8b9c3e26e2..af1b58ab6b4e 100644
--- a/src/android/camera_device.h
+++ b/src/android/camera_device.h
@@ -95,7 +95,7 @@  private:
 	std::unique_ptr<libcamera::CameraConfiguration> config_;
 
 	CameraMetadata *staticMetadata_;
-	std::map<unsigned int, CameraMetadata *> requestTemplates_;
+	std::map<unsigned int, const CameraMetadata *> requestTemplates_;
 	const camera3_callback_ops_t *callbacks_;
 
 	std::vector<Camera3StreamConfiguration> streamConfigurations_;