[libcamera-devel,v2,2/6] android: camera_metadata: Add const version of get()

Message ID 20200725144058.129388-3-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
Add a const version of the CameraMetadata::get() method to retrieve
a const reference to the camera metadata wrapped by the class instance.

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_metadata.cpp | 5 +++++
 src/android/camera_metadata.h   | 1 +
 2 files changed, 6 insertions(+)

Comments

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

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

On Sat, Jul 25, 2020 at 04:40:54PM +0200, Jacopo Mondi wrote:
> Add a const version of the CameraMetadata::get() method to retrieve
> a const reference to the camera metadata wrapped by the class instance.

s/reference/pointer/ ?

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

Here too, s/comR/com>/

> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
> ---
>  src/android/camera_metadata.cpp | 5 +++++
>  src/android/camera_metadata.h   | 1 +
>  2 files changed, 6 insertions(+)
> 
> diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp
> index 47b2e4ef117a..ea33e9c2de25 100644
> --- a/src/android/camera_metadata.cpp
> +++ b/src/android/camera_metadata.cpp
> @@ -50,3 +50,8 @@ camera_metadata_t *CameraMetadata::get()
>  {
>  	return valid_ ? metadata_ : nullptr;
>  }
> +
> +const camera_metadata_t *CameraMetadata::get() const
> +{
> +	return valid_ ? metadata_ : nullptr;
> +}
> diff --git a/src/android/camera_metadata.h b/src/android/camera_metadata.h
> index 348a018165ef..f16dd27bbf44 100644
> --- a/src/android/camera_metadata.h
> +++ b/src/android/camera_metadata.h
> @@ -21,6 +21,7 @@ public:
>  	bool addEntry(uint32_t tag, const void *data, size_t data_count);
>  
>  	camera_metadata_t *get();
> +	const camera_metadata_t *get() const;
>  
>  private:
>  	camera_metadata_t *metadata_;
Jacopo Mondi July 25, 2020, 4:30 p.m. UTC | #2
On Sat, Jul 25, 2020 at 07:16:54PM +0300, Laurent Pinchart wrote:
> Hi Jacopo,
>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>
> On Sat, Jul 25, 2020 at 04:40:54PM +0200, Jacopo Mondi wrote:
> > Add a const version of the CameraMetadata::get() method to retrieve
> > a const reference to the camera metadata wrapped by the class instance.
>
> s/reference/pointer/ ?
>
> >
> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.comR
>
> Here too, s/comR/com>/
>

Ups, I copied and pasted tags
Sorry

> > Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
> > ---
> >  src/android/camera_metadata.cpp | 5 +++++
> >  src/android/camera_metadata.h   | 1 +
> >  2 files changed, 6 insertions(+)
> >
> > diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp
> > index 47b2e4ef117a..ea33e9c2de25 100644
> > --- a/src/android/camera_metadata.cpp
> > +++ b/src/android/camera_metadata.cpp
> > @@ -50,3 +50,8 @@ camera_metadata_t *CameraMetadata::get()
> >  {
> >  	return valid_ ? metadata_ : nullptr;
> >  }
> > +
> > +const camera_metadata_t *CameraMetadata::get() const
> > +{
> > +	return valid_ ? metadata_ : nullptr;
> > +}
> > diff --git a/src/android/camera_metadata.h b/src/android/camera_metadata.h
> > index 348a018165ef..f16dd27bbf44 100644
> > --- a/src/android/camera_metadata.h
> > +++ b/src/android/camera_metadata.h
> > @@ -21,6 +21,7 @@ public:
> >  	bool addEntry(uint32_t tag, const void *data, size_t data_count);
> >
> >  	camera_metadata_t *get();
> > +	const camera_metadata_t *get() const;
> >
> >  private:
> >  	camera_metadata_t *metadata_;
>
> --
> Regards,
>
> Laurent Pinchart

Patch

diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp
index 47b2e4ef117a..ea33e9c2de25 100644
--- a/src/android/camera_metadata.cpp
+++ b/src/android/camera_metadata.cpp
@@ -50,3 +50,8 @@  camera_metadata_t *CameraMetadata::get()
 {
 	return valid_ ? metadata_ : nullptr;
 }
+
+const camera_metadata_t *CameraMetadata::get() const
+{
+	return valid_ ? metadata_ : nullptr;
+}
diff --git a/src/android/camera_metadata.h b/src/android/camera_metadata.h
index 348a018165ef..f16dd27bbf44 100644
--- a/src/android/camera_metadata.h
+++ b/src/android/camera_metadata.h
@@ -21,6 +21,7 @@  public:
 	bool addEntry(uint32_t tag, const void *data, size_t data_count);
 
 	camera_metadata_t *get();
+	const camera_metadata_t *get() const;
 
 private:
 	camera_metadata_t *metadata_;