[raw2rgbpnm PATCH v3 0/3] 10-bit packed raw support

[raw2rgbpnm PATCH v3 0/3] 10-bit packed raw support

[Sakari Ailus]

Hi all,

These patches add support for 10-bit packed raw formats. Adding support
for more bit depths would be trivial (at least up to 16 bits) but I only
needed 10. :-)

The code could be prettier.

since v2:

- Drop bpc argument from raw_get() and raw_put(). The bpc argument wasn't
  really needed there as the functions don't operate on the values (but
  simply pack or unpack them).

- Use unsigned values where appropriate (i.e. make signed values
  unsigned).

since v1:

- Use __attribute__((fallthrough)) instead of a compiler flag.

- Better error message on what's wrong if a proper unpacked format isn't
  found when processing the newly supported packed 10-bit raw formats.

Sakari Ailus (3):
  Add explicit switch fallthrough notation
  Add compiler options to avoid warnings
  Add 10-bit CSI-2 packed format support

 Makefile     |  2 +-
 raw2rgbpnm.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 87 insertions(+), 5 deletions(-)

-- 
2.47.3

[raw2rgbpnm PATCH v3 1/3] Add explicit switch fallthrough notation

[Sakari Ailus]

Use __attribute__((fallthrough)) instead of a comment this is taking
place, to make modern GCC happy.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
 raw2rgbpnm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/raw2rgbpnm.c b/raw2rgbpnm.c
index baeb8efc863a..5df3ff7ab31d 100644
--- a/raw2rgbpnm.c
+++ b/raw2rgbpnm.c
@@ -362,7 +362,7 @@ static void raw_to_rgb(const struct format_info *info,
 
 	case V4L2_PIX_FMT_NV21:
 		color_pos = 0;
-		/* fallthrough */
+		__attribute__((fallthrough));
 	case V4L2_PIX_FMT_NV12:
 		src_luma = src;
 		src_chroma = &src[src_width * src_height];
@@ -576,7 +576,7 @@ static void raw_to_rgb(const struct format_info *info,
 	case V4L2_PIX_FMT_SRGGB10:
 		if (raw_layout_to_grbg(info, src, src_width, src_height, src_stride))
 			error("Can't convert RAW layout to GRBG");
-		/* fallthrough */
+		__attribute__((fallthrough));
 	case V4L2_PIX_FMT_SGRBG16:
 	case V4L2_PIX_FMT_SGRBG14:
 	case V4L2_PIX_FMT_SGRBG12:
@@ -620,7 +620,7 @@ static void raw_to_rgb(const struct format_info *info,
 	case V4L2_PIX_FMT_SRGGB8:
 		if (raw_layout_to_grbg(info, src, src_width, src_height, src_stride))
 			error("Can't convert RAW layout to GRBG");
-		/* fallthrough */
+		__attribute__((fallthrough));
 	case V4L2_PIX_FMT_SGRBG8:
 		buf = malloc(src_width * src_height * 3);
 		if (buf==NULL) error("out of memory");
@@ -688,7 +688,7 @@ static void raw_to_rgb(const struct format_info *info,
 
 	case V4L2_PIX_FMT_BGR24:
 		swaprb = !swaprb;
-		/* fallthrough */
+		__attribute__((fallthrough));
 	case V4L2_PIX_FMT_RGB24:
 		for (src_y = 0, dst_y = 0; dst_y < src_height; src_y++, dst_y++) {
 			for (src_x = 0, dst_x = 0; dst_x < src_width; ) {
-- 
2.47.3

[raw2rgbpnm PATCH v3 2/3] Add compiler options to avoid warnings

[Sakari Ailus]

Add -Wno-missing-field-initializers option to avoid warnings on modern
GCC.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index ab363501a212..7545682dbcce 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 CROSS_COMPILE ?=
 
 CC	:= $(CROSS_COMPILE)gcc
-CFLAGS	?= -O2 -W -Wall -Iinclude
+CFLAGS	?= -O2 -W -Wall -Iinclude -Wno-missing-field-initializers
 LDFLAGS	?=
 
 %.o : %.c
-- 
2.47.3

[raw2rgbpnm PATCH v3 3/3] Add 10-bit CSI-2 packed format support

[Sakari Ailus]

Add support for the 10-bit CSI-2 packed raw formats.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
 raw2rgbpnm.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/raw2rgbpnm.c b/raw2rgbpnm.c
index 5df3ff7ab31d..f3ff515a2923 100644
--- a/raw2rgbpnm.c
+++ b/raw2rgbpnm.c
@@ -25,6 +25,7 @@
 
 #include <ctype.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
@@ -56,6 +57,7 @@ static const struct format_info {
 	unsigned int cb_pos;
 	unsigned int cr_pos;
 	unsigned int planes;
+	__u32 compat_fmt;
 } v4l2_pix_fmt_str[] = {
 	{ V4L2_PIX_FMT_RGB332,	8,  0,  "RGB332 (8 RGB-3-3-2)", 0, 0, 0, 1 },
 	{ V4L2_PIX_FMT_RGB555,	16, 5,  "RGB555 (16 RGB-5-5-5)", 0, 0, 0, 1 },
@@ -98,6 +100,10 @@ static const struct format_info {
 	{ V4L2_PIX_FMT_SGBRG10,	16, 10, "SGBRG10 (10 GBGB.. RGRG..)", 0, 0, 0, 1 },
 	{ V4L2_PIX_FMT_SGRBG10,	16, 10, "SGRBG10 (10 GRGR.. BGBG..)", 0, 0, 0, 1 },
 	{ V4L2_PIX_FMT_SRGGB10,	16, 10, "SRGGB10 (10 RGRG.. GBGB..)", 0, 0, 0, 1 },
+	{ V4L2_PIX_FMT_SBGGR10P, 10, 10, "SBGGR10P (10 BGBG.. GRGR..)", 0, 0, 0, 1, V4L2_PIX_FMT_SBGGR10 },
+	{ V4L2_PIX_FMT_SGBRG10P, 10, 10, "SGBRG10P (10 GBGB.. RGRG..)", 0, 0, 0, 1, V4L2_PIX_FMT_SGBRG10 },
+	{ V4L2_PIX_FMT_SGRBG10P, 10, 10, "SGRBG10P (10 GRGR.. BGBG..)", 0, 0, 0, 1, V4L2_PIX_FMT_SGRBG10 },
+	{ V4L2_PIX_FMT_SRGGB10P, 10, 10, "SRGGB10P (10 RGRG.. GBGB..)", 0, 0, 0, 1, V4L2_PIX_FMT_SRGGB10 },
 	{ V4L2_PIX_FMT_SBGGR12,	16, 12, "SBGGR12 (12 BGBG.. GRGR..)", 0, 0, 0, 1 },
 	{ V4L2_PIX_FMT_SGBRG12,	16, 12, "SGBRG12 (12 GBGB.. RGRG..)", 0, 0, 0, 1 },
 	{ V4L2_PIX_FMT_SGRBG12,	16, 12, "SGRBG12 (12 GRGR.. BGBG..)", 0, 0, 0, 1 },
@@ -186,6 +192,45 @@ static unsigned char *read_raw_data(char *filename, int width, int height,
 	return b;
 }
 
+static inline uint16_t raw_get(uint8_t bpp, unsigned char *ptr,
+			       unsigned int stride, unsigned int x,
+			       unsigned int y)
+{
+	switch (bpp) {
+	case 10: {
+		unsigned char *base = ptr + y * stride + (x & ~3U) / 4 * 5;
+		unsigned int idx = x & 3U;
+
+		return (base[idx] << 2) | ((base[4] >> (idx << 1)) & 3U);
+	}
+	default:
+		error("getting raw %u not supported", bpp);
+	}
+
+	return 0;
+}
+
+static inline void raw_put(uint8_t bpp, unsigned char *ptr, unsigned int stride,
+			   unsigned int x, unsigned int y, uint16_t value)
+{
+	switch (bpp) {
+	case 10: {
+		unsigned char *base = ptr + y * stride + (x & ~3U) / 4 * 5;
+		unsigned int idx = x & 3U;
+
+		base[idx] = value >> 2;
+		base[4] &= ~(3U << (idx << 1));
+		base[4] |= (value & 3U) << (idx << 1);
+		break;
+	}
+	case 16:
+		*(uint16_t *)&ptr[y * stride + x * 2] = value;
+		break;
+	default:
+		error("putting raw %u not supported", bpp);
+	}
+}
+
 static int raw_layout_to_grbg(const struct format_info *info, unsigned char *src,
 			      int src_width, int src_height, unsigned int src_stride)
 {
@@ -283,6 +328,7 @@ static int raw_layout_to_grbg(const struct format_info *info, unsigned char *src
 static void raw_to_rgb(const struct format_info *info,
 		       unsigned char *src, int src_width, int src_height, unsigned char *rgb)
 {
+	unsigned char *tmp_src = NULL;
 	unsigned int src_stride = src_width * info->bpp / 8;
 	unsigned int rgb_stride = src_width * 3;
 	unsigned char *src_luma, *src_chroma;
@@ -298,6 +344,40 @@ static void raw_to_rgb(const struct format_info *info,
 	int cr_pos;
 	int shift;
 
+	switch (info->fmt) {
+	case V4L2_PIX_FMT_SBGGR10P:
+	case V4L2_PIX_FMT_SGBRG10P:
+	case V4L2_PIX_FMT_SRGGB10P:
+	case V4L2_PIX_FMT_SGRBG10P: {
+		const struct format_info *old_info = info;
+		unsigned int new_stride = src_width * 2;
+
+		tmp_src = malloc(new_stride * src_height);
+		if (!tmp_src)
+			error("can't allocate memory for the temporary buffer");
+
+		for (src_y = 0; src_y < src_height; src_y++)
+			for (src_x = 0; src_x < src_width; src_x++)
+				raw_put(16, tmp_src, new_stride, src_x, src_y,
+					raw_get(info->bpp, src, src_stride,
+						src_x, src_y));
+
+		src_stride = new_stride;
+		src = tmp_src;
+
+		for (unsigned int i = 0; i < SIZE(v4l2_pix_fmt_str); i++) {
+			if (v4l2_pix_fmt_str[i].fmt == info->compat_fmt) {
+				info = &v4l2_pix_fmt_str[i];
+				break;
+			}
+		}
+
+		if (info->compat_fmt)
+			error("no supported format found for %s",
+			      old_info->name);
+	}
+	}
+
 	switch (info->fmt) {
 	case V4L2_PIX_FMT_VYUY:
 	case V4L2_PIX_FMT_YVYU:
@@ -734,6 +814,8 @@ static void raw_to_rgb(const struct format_info *info,
 		}
 		break;
 	}
+
+	free(tmp_src);
 }
 
 static int parse_format(const char *p, int *w, int *h)
-- 
2.47.3

Re: [raw2rgbpnm PATCH v3 1/3] Add explicit switch fallthrough notation

[Laurent Pinchart]

On Wed, Feb 18, 2026 at 10:34:22AM +0200, Sakari Ailus wrote:
> Use __attribute__((fallthrough)) instead of a comment this is taking
> place, to make modern GCC happy.

This will require gcc 7 or newer, which I think is fine. You could check
the compiler version at build time and emit an error if the compiler is
not recent enough (and you could use that as an opportunity to switch
from make to meson :-)). This is of course out of scope for this series.

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

> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> ---
>  raw2rgbpnm.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/raw2rgbpnm.c b/raw2rgbpnm.c
> index baeb8efc863a..5df3ff7ab31d 100644
> --- a/raw2rgbpnm.c
> +++ b/raw2rgbpnm.c
> @@ -362,7 +362,7 @@ static void raw_to_rgb(const struct format_info *info,
>  
>  	case V4L2_PIX_FMT_NV21:
>  		color_pos = 0;
> -		/* fallthrough */
> +		__attribute__((fallthrough));
>  	case V4L2_PIX_FMT_NV12:
>  		src_luma = src;
>  		src_chroma = &src[src_width * src_height];
> @@ -576,7 +576,7 @@ static void raw_to_rgb(const struct format_info *info,
>  	case V4L2_PIX_FMT_SRGGB10:
>  		if (raw_layout_to_grbg(info, src, src_width, src_height, src_stride))
>  			error("Can't convert RAW layout to GRBG");
> -		/* fallthrough */
> +		__attribute__((fallthrough));
>  	case V4L2_PIX_FMT_SGRBG16:
>  	case V4L2_PIX_FMT_SGRBG14:
>  	case V4L2_PIX_FMT_SGRBG12:
> @@ -620,7 +620,7 @@ static void raw_to_rgb(const struct format_info *info,
>  	case V4L2_PIX_FMT_SRGGB8:
>  		if (raw_layout_to_grbg(info, src, src_width, src_height, src_stride))
>  			error("Can't convert RAW layout to GRBG");
> -		/* fallthrough */
> +		__attribute__((fallthrough));
>  	case V4L2_PIX_FMT_SGRBG8:
>  		buf = malloc(src_width * src_height * 3);
>  		if (buf==NULL) error("out of memory");
> @@ -688,7 +688,7 @@ static void raw_to_rgb(const struct format_info *info,
>  
>  	case V4L2_PIX_FMT_BGR24:
>  		swaprb = !swaprb;
> -		/* fallthrough */
> +		__attribute__((fallthrough));
>  	case V4L2_PIX_FMT_RGB24:
>  		for (src_y = 0, dst_y = 0; dst_y < src_height; src_y++, dst_y++) {
>  			for (src_x = 0, dst_x = 0; dst_x < src_width; ) {

-- 
Regards,

Laurent Pinchart

Re: [raw2rgbpnm PATCH v3 2/3] Add compiler options to avoid warnings

[Laurent Pinchart]

On Wed, Feb 18, 2026 at 10:34:23AM +0200, Sakari Ailus wrote:
> Add -Wno-missing-field-initializers option to avoid warnings on modern
> GCC.

Maybe I should have mentioned that explicitly in v1, but I would also
fix the code instead of disabling the warning.

> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> ---
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index ab363501a212..7545682dbcce 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1,7 +1,7 @@
>  CROSS_COMPILE ?=
>  
>  CC	:= $(CROSS_COMPILE)gcc
> -CFLAGS	?= -O2 -W -Wall -Iinclude
> +CFLAGS	?= -O2 -W -Wall -Iinclude -Wno-missing-field-initializers
>  LDFLAGS	?=
>  
>  %.o : %.c

-- 
Regards,

Laurent Pinchart

Re: [raw2rgbpnm PATCH v3 2/3] Add compiler options to avoid warnings

[Sakari Ailus]

Hi Laurent,

On Wed, Feb 18, 2026 at 11:27:36AM +0100, Laurent Pinchart wrote:
> On Wed, Feb 18, 2026 at 10:34:23AM +0200, Sakari Ailus wrote:
> > Add -Wno-missing-field-initializers option to avoid warnings on modern
> > GCC.
> 
> Maybe I should have mentioned that explicitly in v1, but I would also
> fix the code instead of disabling the warning.

Since when has it been preferred to require initialising every field in a
struct? We don't do it in the kernel either... nor this is C++.

> 
> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > ---
> >  Makefile | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/Makefile b/Makefile
> > index ab363501a212..7545682dbcce 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -1,7 +1,7 @@
> >  CROSS_COMPILE ?=
> >  
> >  CC	:= $(CROSS_COMPILE)gcc
> > -CFLAGS	?= -O2 -W -Wall -Iinclude
> > +CFLAGS	?= -O2 -W -Wall -Iinclude -Wno-missing-field-initializers
> >  LDFLAGS	?=
> >  
> >  %.o : %.c
> 

-- 
Regards,

Sakari Ailus

Re: [raw2rgbpnm PATCH v3 1/3] Add explicit switch fallthrough notation

[Sakari Ailus]

Hi Laurent,

On Wed, Feb 18, 2026 at 11:26:18AM +0100, Laurent Pinchart wrote:
> On Wed, Feb 18, 2026 at 10:34:22AM +0200, Sakari Ailus wrote:
> > Use __attribute__((fallthrough)) instead of a comment this is taking
> > place, to make modern GCC happy.
> 
> This will require gcc 7 or newer, which I think is fine. You could check
> the compiler version at build time and emit an error if the compiler is
> not recent enough (and you could use that as an opportunity to switch
> from make to meson :-)). This is of course out of scope for this series.

That could be interesting. Although there are just three .c files to
compile, I think make can do it. ;-)

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

Thanks, but the patches have been already merged. I'll use this for a
future patch. :-D

-- 
Kind regards,

Sakari Ailus

Re: [raw2rgbpnm PATCH v3 1/3] Add explicit switch fallthrough notation

[Laurent Pinchart]

On Wed, Feb 18, 2026 at 01:21:30PM +0200, Sakari Ailus wrote:
> On Wed, Feb 18, 2026 at 11:26:18AM +0100, Laurent Pinchart wrote:
> > On Wed, Feb 18, 2026 at 10:34:22AM +0200, Sakari Ailus wrote:
> > > Use __attribute__((fallthrough)) instead of a comment this is taking
> > > place, to make modern GCC happy.
> > 
> > This will require gcc 7 or newer, which I think is fine. You could check
> > the compiler version at build time and emit an error if the compiler is
> > not recent enough (and you could use that as an opportunity to switch
> > from make to meson :-)). This is of course out of scope for this series.
> 
> That could be interesting. Although there are just three .c files to
> compile, I think make can do it. ;-)

Yavta has a single .c file and I still moved it to meson :-)

> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> 
> Thanks, but the patches have been already merged. I'll use this for a
> future patch. :-D

-- 
Regards,

Laurent Pinchart