[libcamera-devel,2/4] cam: Rename sdl_texture_yuyv.{cpp, h} to sdl_texture_yuv.{cpp, h}
diff mbox series

Message ID 20220807021718.9789-3-laurent.pinchart@ideasonboard.com
State Accepted
Headers show
Series
  • cam: Add support for NV12 in the SDL sink
Related show

Commit Message

Laurent Pinchart Aug. 7, 2022, 2:17 a.m. UTC
In preparation for the addition of NV12 support in the SDL sink, rename
the sdl_texture_yuyv.{cpp,h} files to just "yuv". Separate
sdl_texture_nv12.{cpp,h} files could be added instead, but given how
short the implementation will be, grouping all YUV formats in a single
file is better.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/cam/meson.build                                   | 2 +-
 src/cam/sdl_sink.cpp                                  | 2 +-
 src/cam/{sdl_texture_yuyv.cpp => sdl_texture_yuv.cpp} | 4 ++--
 src/cam/{sdl_texture_yuyv.h => sdl_texture_yuv.h}     | 0
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename src/cam/{sdl_texture_yuyv.cpp => sdl_texture_yuv.cpp} (83%)
 rename src/cam/{sdl_texture_yuyv.h => sdl_texture_yuv.h} (100%)

Comments

Kieran Bingham Aug. 7, 2022, 10:23 p.m. UTC | #1
Quoting Laurent Pinchart via libcamera-devel (2022-08-07 03:17:16)
> In preparation for the addition of NV12 support in the SDL sink, rename
> the sdl_texture_yuyv.{cpp,h} files to just "yuv". Separate
> sdl_texture_nv12.{cpp,h} files could be added instead, but given how
> short the implementation will be, grouping all YUV formats in a single
> file is better.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  src/cam/meson.build                                   | 2 +-
>  src/cam/sdl_sink.cpp                                  | 2 +-
>  src/cam/{sdl_texture_yuyv.cpp => sdl_texture_yuv.cpp} | 4 ++--
>  src/cam/{sdl_texture_yuyv.h => sdl_texture_yuv.h}     | 0

Can you also update the reference to 'yuyv' in sdl_texture_yuyv.h ?

 * sdl_texture_yuyv.h - SDL Texture YUYV

With that,


Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>


>  4 files changed, 4 insertions(+), 4 deletions(-)
>  rename src/cam/{sdl_texture_yuyv.cpp => sdl_texture_yuv.cpp} (83%)
>  rename src/cam/{sdl_texture_yuyv.h => sdl_texture_yuv.h} (100%)
> 
> diff --git a/src/cam/meson.build b/src/cam/meson.build
> index 4dfa7b22aea9..8259239ff5a2 100644
> --- a/src/cam/meson.build
> +++ b/src/cam/meson.build
> @@ -40,7 +40,7 @@ if libsdl2.found()
>      cam_sources += files([
>          'sdl_sink.cpp',
>          'sdl_texture.cpp',
> -        'sdl_texture_yuyv.cpp'
> +        'sdl_texture_yuv.cpp',
>      ])
>  
>      if libjpeg.found()
> diff --git a/src/cam/sdl_sink.cpp b/src/cam/sdl_sink.cpp
> index a59d07519e1f..04350bd5365b 100644
> --- a/src/cam/sdl_sink.cpp
> +++ b/src/cam/sdl_sink.cpp
> @@ -24,7 +24,7 @@
>  #ifdef HAVE_LIBJPEG
>  #include "sdl_texture_mjpg.h"
>  #endif
> -#include "sdl_texture_yuyv.h"
> +#include "sdl_texture_yuv.h"
>  
>  using namespace libcamera;
>  
> diff --git a/src/cam/sdl_texture_yuyv.cpp b/src/cam/sdl_texture_yuv.cpp
> similarity index 83%
> rename from src/cam/sdl_texture_yuyv.cpp
> rename to src/cam/sdl_texture_yuv.cpp
> index cb51fb0ef478..07df4961a1ab 100644
> --- a/src/cam/sdl_texture_yuyv.cpp
> +++ b/src/cam/sdl_texture_yuv.cpp
> @@ -2,10 +2,10 @@
>  /*
>   * Copyright (C) 2022, Ideas on Board Oy
>   *
> - * sdl_texture_yuyv.cpp - SDL Texture YUYV
> + * sdl_texture_yuv.cpp - SDL Texture YUYV
>   */
>  
> -#include "sdl_texture_yuyv.h"
> +#include "sdl_texture_yuv.h"
>  
>  using namespace libcamera;
>  
> diff --git a/src/cam/sdl_texture_yuyv.h b/src/cam/sdl_texture_yuv.h
> similarity index 100%
> rename from src/cam/sdl_texture_yuyv.h
> rename to src/cam/sdl_texture_yuv.h
> -- 
> Regards,
> 
> Laurent Pinchart
>
Laurent Pinchart Aug. 7, 2022, 10:41 p.m. UTC | #2
Hi Kieran,

On Sun, Aug 07, 2022 at 11:23:08PM +0100, Kieran Bingham wrote:
> Quoting Laurent Pinchart via libcamera-devel (2022-08-07 03:17:16)
> > In preparation for the addition of NV12 support in the SDL sink, rename
> > the sdl_texture_yuyv.{cpp,h} files to just "yuv". Separate
> > sdl_texture_nv12.{cpp,h} files could be added instead, but given how
> > short the implementation will be, grouping all YUV formats in a single
> > file is better.
> > 
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > ---
> >  src/cam/meson.build                                   | 2 +-
> >  src/cam/sdl_sink.cpp                                  | 2 +-
> >  src/cam/{sdl_texture_yuyv.cpp => sdl_texture_yuv.cpp} | 4 ++--
> >  src/cam/{sdl_texture_yuyv.h => sdl_texture_yuv.h}     | 0
> 
> Can you also update the reference to 'yuyv' in sdl_texture_yuyv.h ?
> 
>  * sdl_texture_yuyv.h - SDL Texture YUYV

I've done so in 4/4, where I add support for a different YUV format
(NV12). Is that OK ?

> With that,
> 
> 
> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> 
> 
> >  4 files changed, 4 insertions(+), 4 deletions(-)
> >  rename src/cam/{sdl_texture_yuyv.cpp => sdl_texture_yuv.cpp} (83%)
> >  rename src/cam/{sdl_texture_yuyv.h => sdl_texture_yuv.h} (100%)
> > 
> > diff --git a/src/cam/meson.build b/src/cam/meson.build
> > index 4dfa7b22aea9..8259239ff5a2 100644
> > --- a/src/cam/meson.build
> > +++ b/src/cam/meson.build
> > @@ -40,7 +40,7 @@ if libsdl2.found()
> >      cam_sources += files([
> >          'sdl_sink.cpp',
> >          'sdl_texture.cpp',
> > -        'sdl_texture_yuyv.cpp'
> > +        'sdl_texture_yuv.cpp',
> >      ])
> >  
> >      if libjpeg.found()
> > diff --git a/src/cam/sdl_sink.cpp b/src/cam/sdl_sink.cpp
> > index a59d07519e1f..04350bd5365b 100644
> > --- a/src/cam/sdl_sink.cpp
> > +++ b/src/cam/sdl_sink.cpp
> > @@ -24,7 +24,7 @@
> >  #ifdef HAVE_LIBJPEG
> >  #include "sdl_texture_mjpg.h"
> >  #endif
> > -#include "sdl_texture_yuyv.h"
> > +#include "sdl_texture_yuv.h"
> >  
> >  using namespace libcamera;
> >  
> > diff --git a/src/cam/sdl_texture_yuyv.cpp b/src/cam/sdl_texture_yuv.cpp
> > similarity index 83%
> > rename from src/cam/sdl_texture_yuyv.cpp
> > rename to src/cam/sdl_texture_yuv.cpp
> > index cb51fb0ef478..07df4961a1ab 100644
> > --- a/src/cam/sdl_texture_yuyv.cpp
> > +++ b/src/cam/sdl_texture_yuv.cpp
> > @@ -2,10 +2,10 @@
> >  /*
> >   * Copyright (C) 2022, Ideas on Board Oy
> >   *
> > - * sdl_texture_yuyv.cpp - SDL Texture YUYV
> > + * sdl_texture_yuv.cpp - SDL Texture YUYV
> >   */
> >  
> > -#include "sdl_texture_yuyv.h"
> > +#include "sdl_texture_yuv.h"
> >  
> >  using namespace libcamera;
> >  
> > diff --git a/src/cam/sdl_texture_yuyv.h b/src/cam/sdl_texture_yuv.h
> > similarity index 100%
> > rename from src/cam/sdl_texture_yuyv.h
> > rename to src/cam/sdl_texture_yuv.h
Laurent Pinchart Aug. 7, 2022, 10:43 p.m. UTC | #3
On Mon, Aug 08, 2022 at 01:41:55AM +0300, Laurent Pinchart wrote:
> Hi Kieran,
> 
> On Sun, Aug 07, 2022 at 11:23:08PM +0100, Kieran Bingham wrote:
> > Quoting Laurent Pinchart via libcamera-devel (2022-08-07 03:17:16)
> > > In preparation for the addition of NV12 support in the SDL sink, rename
> > > the sdl_texture_yuyv.{cpp,h} files to just "yuv". Separate
> > > sdl_texture_nv12.{cpp,h} files could be added instead, but given how
> > > short the implementation will be, grouping all YUV formats in a single
> > > file is better.
> > > 
> > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > > ---
> > >  src/cam/meson.build                                   | 2 +-
> > >  src/cam/sdl_sink.cpp                                  | 2 +-
> > >  src/cam/{sdl_texture_yuyv.cpp => sdl_texture_yuv.cpp} | 4 ++--
> > >  src/cam/{sdl_texture_yuyv.h => sdl_texture_yuv.h}     | 0
> > 
> > Can you also update the reference to 'yuyv' in sdl_texture_yuyv.h ?
> > 
> >  * sdl_texture_yuyv.h - SDL Texture YUYV
> 
> I've done so in 4/4, where I add support for a different YUV format
> (NV12). Is that OK ?

Ad you meant the file name. Yes, will fix it.

> > With that,
> > 
> > 
> > Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> > 
> > 
> > >  4 files changed, 4 insertions(+), 4 deletions(-)
> > >  rename src/cam/{sdl_texture_yuyv.cpp => sdl_texture_yuv.cpp} (83%)
> > >  rename src/cam/{sdl_texture_yuyv.h => sdl_texture_yuv.h} (100%)
> > > 
> > > diff --git a/src/cam/meson.build b/src/cam/meson.build
> > > index 4dfa7b22aea9..8259239ff5a2 100644
> > > --- a/src/cam/meson.build
> > > +++ b/src/cam/meson.build
> > > @@ -40,7 +40,7 @@ if libsdl2.found()
> > >      cam_sources += files([
> > >          'sdl_sink.cpp',
> > >          'sdl_texture.cpp',
> > > -        'sdl_texture_yuyv.cpp'
> > > +        'sdl_texture_yuv.cpp',
> > >      ])
> > >  
> > >      if libjpeg.found()
> > > diff --git a/src/cam/sdl_sink.cpp b/src/cam/sdl_sink.cpp
> > > index a59d07519e1f..04350bd5365b 100644
> > > --- a/src/cam/sdl_sink.cpp
> > > +++ b/src/cam/sdl_sink.cpp
> > > @@ -24,7 +24,7 @@
> > >  #ifdef HAVE_LIBJPEG
> > >  #include "sdl_texture_mjpg.h"
> > >  #endif
> > > -#include "sdl_texture_yuyv.h"
> > > +#include "sdl_texture_yuv.h"
> > >  
> > >  using namespace libcamera;
> > >  
> > > diff --git a/src/cam/sdl_texture_yuyv.cpp b/src/cam/sdl_texture_yuv.cpp
> > > similarity index 83%
> > > rename from src/cam/sdl_texture_yuyv.cpp
> > > rename to src/cam/sdl_texture_yuv.cpp
> > > index cb51fb0ef478..07df4961a1ab 100644
> > > --- a/src/cam/sdl_texture_yuyv.cpp
> > > +++ b/src/cam/sdl_texture_yuv.cpp
> > > @@ -2,10 +2,10 @@
> > >  /*
> > >   * Copyright (C) 2022, Ideas on Board Oy
> > >   *
> > > - * sdl_texture_yuyv.cpp - SDL Texture YUYV
> > > + * sdl_texture_yuv.cpp - SDL Texture YUYV
> > >   */
> > >  
> > > -#include "sdl_texture_yuyv.h"
> > > +#include "sdl_texture_yuv.h"
> > >  
> > >  using namespace libcamera;
> > >  
> > > diff --git a/src/cam/sdl_texture_yuyv.h b/src/cam/sdl_texture_yuv.h
> > > similarity index 100%
> > > rename from src/cam/sdl_texture_yuyv.h
> > > rename to src/cam/sdl_texture_yuv.h
Jacopo Mondi Aug. 8, 2022, 8:21 a.m. UTC | #4
Hi Laurent

On Sun, Aug 07, 2022 at 05:17:16AM +0300, Laurent Pinchart via libcamera-devel wrote:
> In preparation for the addition of NV12 support in the SDL sink, rename
> the sdl_texture_yuyv.{cpp,h} files to just "yuv". Separate
> sdl_texture_nv12.{cpp,h} files could be added instead, but given how
> short the implementation will be, grouping all YUV formats in a single
> file is better.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---

With Kieran's comment addressed
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>

Thanks
  j

>  src/cam/meson.build                                   | 2 +-
>  src/cam/sdl_sink.cpp                                  | 2 +-
>  src/cam/{sdl_texture_yuyv.cpp => sdl_texture_yuv.cpp} | 4 ++--
>  src/cam/{sdl_texture_yuyv.h => sdl_texture_yuv.h}     | 0
>  4 files changed, 4 insertions(+), 4 deletions(-)
>  rename src/cam/{sdl_texture_yuyv.cpp => sdl_texture_yuv.cpp} (83%)
>  rename src/cam/{sdl_texture_yuyv.h => sdl_texture_yuv.h} (100%)
>
> diff --git a/src/cam/meson.build b/src/cam/meson.build
> index 4dfa7b22aea9..8259239ff5a2 100644
> --- a/src/cam/meson.build
> +++ b/src/cam/meson.build
> @@ -40,7 +40,7 @@ if libsdl2.found()
>      cam_sources += files([
>          'sdl_sink.cpp',
>          'sdl_texture.cpp',
> -        'sdl_texture_yuyv.cpp'
> +        'sdl_texture_yuv.cpp',
>      ])
>
>      if libjpeg.found()
> diff --git a/src/cam/sdl_sink.cpp b/src/cam/sdl_sink.cpp
> index a59d07519e1f..04350bd5365b 100644
> --- a/src/cam/sdl_sink.cpp
> +++ b/src/cam/sdl_sink.cpp
> @@ -24,7 +24,7 @@
>  #ifdef HAVE_LIBJPEG
>  #include "sdl_texture_mjpg.h"
>  #endif
> -#include "sdl_texture_yuyv.h"
> +#include "sdl_texture_yuv.h"
>
>  using namespace libcamera;
>
> diff --git a/src/cam/sdl_texture_yuyv.cpp b/src/cam/sdl_texture_yuv.cpp
> similarity index 83%
> rename from src/cam/sdl_texture_yuyv.cpp
> rename to src/cam/sdl_texture_yuv.cpp
> index cb51fb0ef478..07df4961a1ab 100644
> --- a/src/cam/sdl_texture_yuyv.cpp
> +++ b/src/cam/sdl_texture_yuv.cpp
> @@ -2,10 +2,10 @@
>  /*
>   * Copyright (C) 2022, Ideas on Board Oy
>   *
> - * sdl_texture_yuyv.cpp - SDL Texture YUYV
> + * sdl_texture_yuv.cpp - SDL Texture YUYV
>   */
>
> -#include "sdl_texture_yuyv.h"
> +#include "sdl_texture_yuv.h"
>
>  using namespace libcamera;
>
> diff --git a/src/cam/sdl_texture_yuyv.h b/src/cam/sdl_texture_yuv.h
> similarity index 100%
> rename from src/cam/sdl_texture_yuyv.h
> rename to src/cam/sdl_texture_yuv.h
> --
> Regards,
>
> Laurent Pinchart
>
Eric Curtin Aug. 8, 2022, 9:20 a.m. UTC | #5
On Sun, 7 Aug 2022 at 03:17, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
>
> In preparation for the addition of NV12 support in the SDL sink, rename
> the sdl_texture_yuyv.{cpp,h} files to just "yuv". Separate
> sdl_texture_nv12.{cpp,h} files could be added instead, but given how
> short the implementation will be, grouping all YUV formats in a single
> file is better.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

LGTM

Reviewed-by: Eric Curtin <ecurtin@redhat.com>

> ---
>  src/cam/meson.build                                   | 2 +-
>  src/cam/sdl_sink.cpp                                  | 2 +-
>  src/cam/{sdl_texture_yuyv.cpp => sdl_texture_yuv.cpp} | 4 ++--
>  src/cam/{sdl_texture_yuyv.h => sdl_texture_yuv.h}     | 0
>  4 files changed, 4 insertions(+), 4 deletions(-)
>  rename src/cam/{sdl_texture_yuyv.cpp => sdl_texture_yuv.cpp} (83%)
>  rename src/cam/{sdl_texture_yuyv.h => sdl_texture_yuv.h} (100%)
>
> diff --git a/src/cam/meson.build b/src/cam/meson.build
> index 4dfa7b22aea9..8259239ff5a2 100644
> --- a/src/cam/meson.build
> +++ b/src/cam/meson.build
> @@ -40,7 +40,7 @@ if libsdl2.found()
>      cam_sources += files([
>          'sdl_sink.cpp',
>          'sdl_texture.cpp',
> -        'sdl_texture_yuyv.cpp'
> +        'sdl_texture_yuv.cpp',
>      ])
>
>      if libjpeg.found()
> diff --git a/src/cam/sdl_sink.cpp b/src/cam/sdl_sink.cpp
> index a59d07519e1f..04350bd5365b 100644
> --- a/src/cam/sdl_sink.cpp
> +++ b/src/cam/sdl_sink.cpp
> @@ -24,7 +24,7 @@
>  #ifdef HAVE_LIBJPEG
>  #include "sdl_texture_mjpg.h"
>  #endif
> -#include "sdl_texture_yuyv.h"
> +#include "sdl_texture_yuv.h"
>
>  using namespace libcamera;
>
> diff --git a/src/cam/sdl_texture_yuyv.cpp b/src/cam/sdl_texture_yuv.cpp
> similarity index 83%
> rename from src/cam/sdl_texture_yuyv.cpp
> rename to src/cam/sdl_texture_yuv.cpp
> index cb51fb0ef478..07df4961a1ab 100644
> --- a/src/cam/sdl_texture_yuyv.cpp
> +++ b/src/cam/sdl_texture_yuv.cpp
> @@ -2,10 +2,10 @@
>  /*
>   * Copyright (C) 2022, Ideas on Board Oy
>   *
> - * sdl_texture_yuyv.cpp - SDL Texture YUYV
> + * sdl_texture_yuv.cpp - SDL Texture YUYV
>   */
>
> -#include "sdl_texture_yuyv.h"
> +#include "sdl_texture_yuv.h"
>
>  using namespace libcamera;
>
> diff --git a/src/cam/sdl_texture_yuyv.h b/src/cam/sdl_texture_yuv.h
> similarity index 100%
> rename from src/cam/sdl_texture_yuyv.h
> rename to src/cam/sdl_texture_yuv.h
> --
> Regards,
>
> Laurent Pinchart
>

Patch
diff mbox series

diff --git a/src/cam/meson.build b/src/cam/meson.build
index 4dfa7b22aea9..8259239ff5a2 100644
--- a/src/cam/meson.build
+++ b/src/cam/meson.build
@@ -40,7 +40,7 @@  if libsdl2.found()
     cam_sources += files([
         'sdl_sink.cpp',
         'sdl_texture.cpp',
-        'sdl_texture_yuyv.cpp'
+        'sdl_texture_yuv.cpp',
     ])
 
     if libjpeg.found()
diff --git a/src/cam/sdl_sink.cpp b/src/cam/sdl_sink.cpp
index a59d07519e1f..04350bd5365b 100644
--- a/src/cam/sdl_sink.cpp
+++ b/src/cam/sdl_sink.cpp
@@ -24,7 +24,7 @@ 
 #ifdef HAVE_LIBJPEG
 #include "sdl_texture_mjpg.h"
 #endif
-#include "sdl_texture_yuyv.h"
+#include "sdl_texture_yuv.h"
 
 using namespace libcamera;
 
diff --git a/src/cam/sdl_texture_yuyv.cpp b/src/cam/sdl_texture_yuv.cpp
similarity index 83%
rename from src/cam/sdl_texture_yuyv.cpp
rename to src/cam/sdl_texture_yuv.cpp
index cb51fb0ef478..07df4961a1ab 100644
--- a/src/cam/sdl_texture_yuyv.cpp
+++ b/src/cam/sdl_texture_yuv.cpp
@@ -2,10 +2,10 @@ 
 /*
  * Copyright (C) 2022, Ideas on Board Oy
  *
- * sdl_texture_yuyv.cpp - SDL Texture YUYV
+ * sdl_texture_yuv.cpp - SDL Texture YUYV
  */
 
-#include "sdl_texture_yuyv.h"
+#include "sdl_texture_yuv.h"
 
 using namespace libcamera;
 
diff --git a/src/cam/sdl_texture_yuyv.h b/src/cam/sdl_texture_yuv.h
similarity index 100%
rename from src/cam/sdl_texture_yuyv.h
rename to src/cam/sdl_texture_yuv.h