[libcamera-devel,v2,12/12] android: camera_device: Make CameraStream a class
diff mbox series

Message ID 20200902152236.69770-13-jacopo@jmondi.org
State Accepted
Headers show
Series
  • android: camera_device: Fix JPEG/RAW sizes
Related show

Commit Message

Jacopo Mondi Sept. 2, 2020, 3:22 p.m. UTC 
Complete the transformation of CameraStream into a class and provide
a read-only interface that allows to access its parameters but not
modify them at run-time.

No functional changes intended but this change aims to make the code
more robust by enforcing a stricter interface in the CameraStream class.

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
---
 src/android/camera_device.cpp |  9 +++++----
 src/android/camera_device.h   | 14 ++++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

Comments

Jacopo Mondi Sept. 4, 2020, 4:15 p.m. UTC | #1 
Hi me

On Wed, Sep 02, 2020 at 05:22:36PM +0200, Jacopo Mondi wrote:
> Complete the transformation of CameraStream into a class and provide
> a read-only interface that allows to access its parameters but not
> modify them at run-time.
>
> No functional changes intended but this change aims to make the code
> more robust by enforcing a stricter interface in the CameraStream class.
>
> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
> ---
>  src/android/camera_device.cpp |  9 +++++----
>  src/android/camera_device.h   | 14 ++++++++------
>  2 files changed, 13 insertions(+), 10 deletions(-)
>
> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
> index 28d8e081eab0..88c85ad183d2 100644
> --- a/src/android/camera_device.cpp
> +++ b/src/android/camera_device.cpp
> @@ -168,8 +168,9 @@ MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer,
>  	}
>  }
>
> -CameraStream::CameraStream(PixelFormat f, Size s, unsigned int i, Encoder *encoder)
> -	: format(f), size(s), index_(i), encoder_(encoder)
> +CameraStream::CameraStream(PixelFormat format, Size size,
> +			   unsigned int index, Encoder *encoder)
> +	: format_(format), size_(size), index_(index), encoder_(encoder)
>  {
>  }
>
> @@ -1415,7 +1416,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques
>  		descriptor->buffers[i].buffer = camera3Buffers[i].buffer;
>
>  		/* Software streams are handled after hardware streams complete. */
> -		if (cameraStream->format == formats::MJPEG)
> +		if (cameraStream->format() == formats::MJPEG)
>  			continue;
>
>  		/*
> @@ -1479,7 +1480,7 @@ void CameraDevice::requestComplete(Request *request)
>  		CameraStream *cameraStream =
>  			static_cast<CameraStream *>(descriptor->buffers[i].stream->priv);
>
> -		if (cameraStream->format != formats::MJPEG)
> +		if (cameraStream->format() != formats::MJPEG)
>  			continue;
>
>  		Encoder *encoder = cameraStream->encoder();
> diff --git a/src/android/camera_device.h b/src/android/camera_device.h
> index 3c57ffec265d..729b2556011b 100644
> --- a/src/android/camera_device.h
> +++ b/src/android/camera_device.h
> @@ -27,19 +27,21 @@
>
>  class CameraMetadata;
>
> -struct CameraStream {
> +class CameraStream
> +{
>  public:
> -	CameraStream(libcamera::PixelFormat, libcamera::Size, unsigned int i,
> -		     Encoder *encoder = nullptr);
> +	CameraStream(libcamera::PixelFormat format, libcamera::Size size,
> +		     unsigned int index, Encoder *encoder = nullptr);
>  	~CameraStream();
>
> +	libcamera::PixelFormat format() const { return format_; }
> +	libcamera::Size size() const { return size_; }

Should these be const & ?

>  	unsigned int index() const { return index_; }
>  	Encoder *encoder() const { return encoder_; }
>
> -	libcamera::PixelFormat format;
> -	libcamera::Size size;
> -
>  private:
> +	libcamera::PixelFormat format_;
> +	libcamera::Size size_;
>  	/*
>  	 * The index of the libcamera StreamConfiguration as added during
>  	 * configureStreams(). A single libcamera Stream may be used to deliver
> --
> 2.28.0
>
Hirokazu Honda Sept. 7, 2020, 7:41 a.m. UTC | #2 
I am starting to review these patches today.
This change LGTM.


On Sat, Sep 5, 2020 at 1:11 AM Jacopo Mondi <jacopo@jmondi.org> wrote:

> Hi me
>
> On Wed, Sep 02, 2020 at 05:22:36PM +0200, Jacopo Mondi wrote:
> > Complete the transformation of CameraStream into a class and provide
> > a read-only interface that allows to access its parameters but not
> > modify them at run-time.
> >
> > No functional changes intended but this change aims to make the code
> > more robust by enforcing a stricter interface in the CameraStream class.
> >
> > Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
> > ---
> >  src/android/camera_device.cpp |  9 +++++----
> >  src/android/camera_device.h   | 14 ++++++++------
> >  2 files changed, 13 insertions(+), 10 deletions(-)
> >
> > diff --git a/src/android/camera_device.cpp
> b/src/android/camera_device.cpp
> > index 28d8e081eab0..88c85ad183d2 100644
> > --- a/src/android/camera_device.cpp
> > +++ b/src/android/camera_device.cpp
> > @@ -168,8 +168,9 @@ MappedCamera3Buffer::MappedCamera3Buffer(const
> buffer_handle_t camera3buffer,
> >       }
> >  }
> >
> > -CameraStream::CameraStream(PixelFormat f, Size s, unsigned int i,
> Encoder *encoder)
> > -     : format(f), size(s), index_(i), encoder_(encoder)
> > +CameraStream::CameraStream(PixelFormat format, Size size,
> > +                        unsigned int index, Encoder *encoder)
> > +     : format_(format), size_(size), index_(index), encoder_(encoder)
> >  {
> >  }
> >
> > @@ -1415,7 +1416,7 @@ int
> CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques
> >               descriptor->buffers[i].buffer = camera3Buffers[i].buffer;
> >
> >               /* Software streams are handled after hardware streams
> complete. */
> > -             if (cameraStream->format == formats::MJPEG)
> > +             if (cameraStream->format() == formats::MJPEG)
> >                       continue;
> >
> >               /*
> > @@ -1479,7 +1480,7 @@ void CameraDevice::requestComplete(Request
> *request)
> >               CameraStream *cameraStream =
> >                       static_cast<CameraStream
> *>(descriptor->buffers[i].stream->priv);
> >
> > -             if (cameraStream->format != formats::MJPEG)
> > +             if (cameraStream->format() != formats::MJPEG)
> >                       continue;
> >
> >               Encoder *encoder = cameraStream->encoder();
> > diff --git a/src/android/camera_device.h b/src/android/camera_device.h
> > index 3c57ffec265d..729b2556011b 100644
> > --- a/src/android/camera_device.h
> > +++ b/src/android/camera_device.h
> > @@ -27,19 +27,21 @@
> >
> >  class CameraMetadata;
> >
> > -struct CameraStream {
> > +class CameraStream
> > +{
> >  public:
> > -     CameraStream(libcamera::PixelFormat, libcamera::Size, unsigned int
> i,
> > -                  Encoder *encoder = nullptr);
> > +     CameraStream(libcamera::PixelFormat format, libcamera::Size size,
> > +                  unsigned int index, Encoder *encoder = nullptr);
> >       ~CameraStream();
> >
> > +     libcamera::PixelFormat format() const { return format_; }
> > +     libcamera::Size size() const { return size_; }
>
> Should these be const & ?
>
>
Yes, it should be. Returning const reference reduces a copy.


> >       unsigned int index() const { return index_; }
> >       Encoder *encoder() const { return encoder_; }
> >
> > -     libcamera::PixelFormat format;
> > -     libcamera::Size size;
> > -
> >  private:
> > +     libcamera::PixelFormat format_;
> > +     libcamera::Size size_;
> >       /*
> >        * The index of the libcamera StreamConfiguration as added during
> >        * configureStreams(). A single libcamera Stream may be used to
> deliver
> > --
> > 2.28.0
> >
>
Hirokazu Honda Sept. 7, 2020, 7:45 a.m. UTC | #3 
I started reviewing these patches today.
This LGTM.

On Sat, Sep 5, 2020 at 1:11 AM Jacopo Mondi <jacopo@jmondi.org> wrote:
>
> Hi me
>
> On Wed, Sep 02, 2020 at 05:22:36PM +0200, Jacopo Mondi wrote:
> > Complete the transformation of CameraStream into a class and provide
> > a read-only interface that allows to access its parameters but not
> > modify them at run-time.
> >
> > No functional changes intended but this change aims to make the code
> > more robust by enforcing a stricter interface in the CameraStream class.
> >
> > Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>

Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
> > ---
> >  src/android/camera_device.cpp |  9 +++++----
> >  src/android/camera_device.h   | 14 ++++++++------
> >  2 files changed, 13 insertions(+), 10 deletions(-)
> >
> > diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
> > index 28d8e081eab0..88c85ad183d2 100644
> > --- a/src/android/camera_device.cpp
> > +++ b/src/android/camera_device.cpp
> > @@ -168,8 +168,9 @@ MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer,
> >       }
> >  }
> >
> > -CameraStream::CameraStream(PixelFormat f, Size s, unsigned int i, Encoder *encoder)
> > -     : format(f), size(s), index_(i), encoder_(encoder)
> > +CameraStream::CameraStream(PixelFormat format, Size size,
> > +                        unsigned int index, Encoder *encoder)
> > +     : format_(format), size_(size), index_(index), encoder_(encoder)
> >  {
> >  }
> >
> > @@ -1415,7 +1416,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques
> >               descriptor->buffers[i].buffer = camera3Buffers[i].buffer;
> >
> >               /* Software streams are handled after hardware streams complete. */
> > -             if (cameraStream->format == formats::MJPEG)
> > +             if (cameraStream->format() == formats::MJPEG)
> >                       continue;
> >
> >               /*
> > @@ -1479,7 +1480,7 @@ void CameraDevice::requestComplete(Request *request)
> >               CameraStream *cameraStream =
> >                       static_cast<CameraStream *>(descriptor->buffers[i].stream->priv);
> >
> > -             if (cameraStream->format != formats::MJPEG)
> > +             if (cameraStream->format() != formats::MJPEG)
> >                       continue;
> >
> >               Encoder *encoder = cameraStream->encoder();
> > diff --git a/src/android/camera_device.h b/src/android/camera_device.h
> > index 3c57ffec265d..729b2556011b 100644
> > --- a/src/android/camera_device.h
> > +++ b/src/android/camera_device.h
> > @@ -27,19 +27,21 @@
> >
> >  class CameraMetadata;
> >
> > -struct CameraStream {
> > +class CameraStream
> > +{
> >  public:
> > -     CameraStream(libcamera::PixelFormat, libcamera::Size, unsigned int i,
> > -                  Encoder *encoder = nullptr);
> > +     CameraStream(libcamera::PixelFormat format, libcamera::Size size,
> > +                  unsigned int index, Encoder *encoder = nullptr);
> >       ~CameraStream();
> >
> > +     libcamera::PixelFormat format() const { return format_; }
> > +     libcamera::Size size() const { return size_; }
>
> Should these be const & ?
>

Yes, it should be. Returning const reference reduces a unnecessary copy.

> >       unsigned int index() const { return index_; }
> >       Encoder *encoder() const { return encoder_; }
> >
> > -     libcamera::PixelFormat format;
> > -     libcamera::Size size;
> > -
> >  private:
> > +     libcamera::PixelFormat format_;
> > +     libcamera::Size size_;
> >       /*
> >        * The index of the libcamera StreamConfiguration as added during
> >        * configureStreams(). A single libcamera Stream may be used to deliver
> > --
> > 2.28.0
> >
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

Patch
diff mbox series 

diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index 28d8e081eab0..88c85ad183d2 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -168,8 +168,9 @@  MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer,
 	}
 }
 
-CameraStream::CameraStream(PixelFormat f, Size s, unsigned int i, Encoder *encoder)
-	: format(f), size(s), index_(i), encoder_(encoder)
+CameraStream::CameraStream(PixelFormat format, Size size,
+			   unsigned int index, Encoder *encoder)
+	: format_(format), size_(size), index_(index), encoder_(encoder)
 {
 }
 
@@ -1415,7 +1416,7 @@  int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques
 		descriptor->buffers[i].buffer = camera3Buffers[i].buffer;
 
 		/* Software streams are handled after hardware streams complete. */
-		if (cameraStream->format == formats::MJPEG)
+		if (cameraStream->format() == formats::MJPEG)
 			continue;
 
 		/*
@@ -1479,7 +1480,7 @@  void CameraDevice::requestComplete(Request *request)
 		CameraStream *cameraStream =
 			static_cast<CameraStream *>(descriptor->buffers[i].stream->priv);
 
-		if (cameraStream->format != formats::MJPEG)
+		if (cameraStream->format() != formats::MJPEG)
 			continue;
 
 		Encoder *encoder = cameraStream->encoder();
diff --git a/src/android/camera_device.h b/src/android/camera_device.h
index 3c57ffec265d..729b2556011b 100644
--- a/src/android/camera_device.h
+++ b/src/android/camera_device.h
@@ -27,19 +27,21 @@ 
 
 class CameraMetadata;
 
-struct CameraStream {
+class CameraStream
+{
 public:
-	CameraStream(libcamera::PixelFormat, libcamera::Size, unsigned int i,
-		     Encoder *encoder = nullptr);
+	CameraStream(libcamera::PixelFormat format, libcamera::Size size,
+		     unsigned int index, Encoder *encoder = nullptr);
 	~CameraStream();
 
+	libcamera::PixelFormat format() const { return format_; }
+	libcamera::Size size() const { return size_; }
 	unsigned int index() const { return index_; }
 	Encoder *encoder() const { return encoder_; }
 
-	libcamera::PixelFormat format;
-	libcamera::Size size;
-
 private:
+	libcamera::PixelFormat format_;
+	libcamera::Size size_;
 	/*
 	 * The index of the libcamera StreamConfiguration as added during
 	 * configureStreams(). A single libcamera Stream may be used to deliver