[libcamera-devel,07/11] android: camera_stream: Return non-const pointer from camera3Stream()
diff mbox series

Message ID 20211018132923.476242-8-umang.jain@ideasonboard.com
State Superseded
Delegated to: Umang Jain
Headers show
Series
  • android: Overhaul request handling
Related show

Commit Message

Umang Jain Oct. 18, 2021, 1:29 p.m. UTC
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

The camera3_stream_t instances are used to interact with the camera
service, whose API uses non-const pointers. Replace the const reference
returned by CameraStream::camera3Stream() with a non-const pointer. It
turns out that nobody calls this function, but new users will be
introduced in subsequent commits.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/android/camera_stream.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jacopo Mondi Oct. 18, 2021, 4:32 p.m. UTC | #1
Hi laurent,

On Mon, Oct 18, 2021 at 06:59:19PM +0530, Umang Jain wrote:
> From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>
> The camera3_stream_t instances are used to interact with the camera
> service, whose API uses non-const pointers. Replace the const reference
> returned by CameraStream::camera3Stream() with a non-const pointer. It
> turns out that nobody calls this function, but new users will be
> introduced in subsequent commits.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>

Thanks
  j

> ---
>  src/android/camera_stream.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h
> index 197bd995..85064268 100644
> --- a/src/android/camera_stream.h
> +++ b/src/android/camera_stream.h
> @@ -114,7 +114,7 @@ public:
>  		     camera3_stream_t *camera3Stream, unsigned int index);
>
>  	Type type() const { return type_; }
> -	const camera3_stream_t &camera3Stream() const { return *camera3Stream_; }
> +	camera3_stream_t *camera3Stream() const { return camera3Stream_; }
>  	const libcamera::StreamConfiguration &configuration() const;
>  	libcamera::Stream *stream() const;
>
> --
> 2.31.0
>
Hirokazu Honda Oct. 19, 2021, 4:51 a.m. UTC | #2
Hi Umang and Laurent, thank you for the patch.

On Tue, Oct 19, 2021 at 1:31 AM Jacopo Mondi <jacopo@jmondi.org> wrote:
>
> Hi laurent,
>
> On Mon, Oct 18, 2021 at 06:59:19PM +0530, Umang Jain wrote:
> > From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> >
> > The camera3_stream_t instances are used to interact with the camera
> > service, whose API uses non-const pointers. Replace the const reference
> > returned by CameraStream::camera3Stream() with a non-const pointer. It
> > turns out that nobody calls this function, but new users will be
> > introduced in subsequent commits.
> >
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>

Reviewed-by: Hirokazu Honda <hiroh@chromium.org>

> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
>
> Thanks
>   j
>
> > ---
> >  src/android/camera_stream.h | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h
> > index 197bd995..85064268 100644
> > --- a/src/android/camera_stream.h
> > +++ b/src/android/camera_stream.h
> > @@ -114,7 +114,7 @@ public:
> >                    camera3_stream_t *camera3Stream, unsigned int index);
> >
> >       Type type() const { return type_; }
> > -     const camera3_stream_t &camera3Stream() const { return *camera3Stream_; }
> > +     camera3_stream_t *camera3Stream() const { return camera3Stream_; }
> >       const libcamera::StreamConfiguration &configuration() const;
> >       libcamera::Stream *stream() const;
> >
> > --
> > 2.31.0
> >

Patch
diff mbox series

diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h
index 197bd995..85064268 100644
--- a/src/android/camera_stream.h
+++ b/src/android/camera_stream.h
@@ -114,7 +114,7 @@  public:
 		     camera3_stream_t *camera3Stream, unsigned int index);
 
 	Type type() const { return type_; }
-	const camera3_stream_t &camera3Stream() const { return *camera3Stream_; }
+	camera3_stream_t *camera3Stream() const { return camera3Stream_; }
 	const libcamera::StreamConfiguration &configuration() const;
 	libcamera::Stream *stream() const;