| Message ID | 20200724142120.95538-4-jacopo@jmondi.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series |
|
| Related | show |
Hi Jacopo, Thank you for the patch. On Fri, Jul 24, 2020 at 04:21:17PM +0200, Jacopo Mondi wrote: > The request capture templates stored in the > CameraDevice::requestTemplates_ should not be modified once created. > > Store a const reference to the request templates in the class member s/reference/pointer/ > map. > > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > 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_;
Hi Jacopo, On 24/07/2020 15:21, Jacopo Mondi wrote: > The request capture templates stored in the > CameraDevice::requestTemplates_ should not be modified once created. > > Store a const reference to the request templates in the class member > map. > > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> This seems ok on it's own, but I've yet to fully understand the patches following: Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > --- > 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_; >
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_;
The request capture templates stored in the CameraDevice::requestTemplates_ should not be modified once created. Store a const reference to the request templates in the class member map. Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> --- src/android/camera_device.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)