* [PATCH 0/2] Add support for V4L2_PIX_FMT_Y16, V4L2_PIX_FMT_RGB32 and V4L2_PIX_FMT_BGR32
@ 2013-08-01 13:04 Ricardo Ribalda Delgado
2013-08-01 13:04 ` [PATCH 1/2] libv4lconvert: Support for Y16 pixel format Ricardo Ribalda Delgado
2013-08-01 13:04 ` [PATCH 2/2] libv4lconvert: Support for RGB32 and BGR32 format Ricardo Ribalda Delgado
0 siblings, 2 replies; 5+ messages in thread
From: Ricardo Ribalda Delgado @ 2013-08-01 13:04 UTC (permalink / raw)
To: hans.verkuil, linux-media; +Cc: Ricardo Ribalda Delgado
This patch adds support for 3 new formats.
Ricardo Ribalda Delgado (2):
libv4lconvert: Support for Y16 pixel format
libv4lconvert: Support for RGB32 and BGR32 format
lib/libv4lconvert/libv4lconvert-priv.h | 11 +++-
lib/libv4lconvert/libv4lconvert.c | 77 +++++++++++++++++++++++--
lib/libv4lconvert/rgbyuv.c | 96 ++++++++++++++++++++++++++++----
3 files changed, 166 insertions(+), 18 deletions(-)
--
1.7.10.4
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] libv4lconvert: Support for Y16 pixel format
2013-08-01 13:04 [PATCH 0/2] Add support for V4L2_PIX_FMT_Y16, V4L2_PIX_FMT_RGB32 and V4L2_PIX_FMT_BGR32 Ricardo Ribalda Delgado
@ 2013-08-01 13:04 ` Ricardo Ribalda Delgado
2013-08-01 13:04 ` [PATCH 2/2] libv4lconvert: Support for RGB32 and BGR32 format Ricardo Ribalda Delgado
1 sibling, 0 replies; 5+ messages in thread
From: Ricardo Ribalda Delgado @ 2013-08-01 13:04 UTC (permalink / raw)
To: hans.verkuil, linux-media; +Cc: Ricardo Ribalda Delgado
This patch adds support for V4L2_PIX_FMT_Y16 format.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
lib/libv4lconvert/libv4lconvert-priv.h | 6 ++++++
lib/libv4lconvert/libv4lconvert.c | 19 +++++++++++++++++++
lib/libv4lconvert/rgbyuv.c | 30 ++++++++++++++++++++++++++++++
3 files changed, 55 insertions(+)
diff --git a/lib/libv4lconvert/libv4lconvert-priv.h b/lib/libv4lconvert/libv4lconvert-priv.h
index c37e220..6422fdd 100644
--- a/lib/libv4lconvert/libv4lconvert-priv.h
+++ b/lib/libv4lconvert/libv4lconvert-priv.h
@@ -152,6 +152,12 @@ void v4lconvert_grey_to_rgb24(const unsigned char *src, unsigned char *dest,
void v4lconvert_grey_to_yuv420(const unsigned char *src, unsigned char *dest,
const struct v4l2_format *src_fmt);
+void v4lconvert_y16_to_rgb24(const unsigned char *src, unsigned char *dest,
+ int width, int height);
+
+void v4lconvert_y16_to_yuv420(const unsigned char *src, unsigned char *dest,
+ const struct v4l2_format *src_fmt);
+
int v4lconvert_y10b_to_rgb24(struct v4lconvert_data *data,
const unsigned char *src, unsigned char *dest, int width, int height);
diff --git a/lib/libv4lconvert/libv4lconvert.c b/lib/libv4lconvert/libv4lconvert.c
index 60010f1..bc5e34f 100644
--- a/lib/libv4lconvert/libv4lconvert.c
+++ b/lib/libv4lconvert/libv4lconvert.c
@@ -128,6 +128,7 @@ static const struct v4lconvert_pixfmt supported_src_pixfmts[] = {
{ V4L2_PIX_FMT_Y4, 8, 20, 20, 0 },
{ V4L2_PIX_FMT_Y6, 8, 20, 20, 0 },
{ V4L2_PIX_FMT_Y10BPACK, 10, 20, 20, 0 },
+ { V4L2_PIX_FMT_Y16, 16, 20, 20, 0 },
};
static const struct v4lconvert_pixfmt supported_dst_pixfmts[] = {
@@ -989,6 +990,24 @@ static int v4lconvert_convert_pixfmt(struct v4lconvert_data *data,
break;
}
+ case V4L2_PIX_FMT_Y16:
+ switch (dest_pix_fmt) {
+ case V4L2_PIX_FMT_RGB24:
+ case V4L2_PIX_FMT_BGR24:
+ v4lconvert_y16_to_rgb24(src, dest, width, height);
+ break;
+ case V4L2_PIX_FMT_YUV420:
+ case V4L2_PIX_FMT_YVU420:
+ v4lconvert_y16_to_yuv420(src, dest, fmt);
+ break;
+ }
+ if (src_size < (width * height * 2)) {
+ V4LCONVERT_ERR("short y16 data frame\n");
+ errno = EPIPE;
+ result = -1;
+ }
+ break;
+
case V4L2_PIX_FMT_GREY:
case V4L2_PIX_FMT_Y4:
case V4L2_PIX_FMT_Y6:
diff --git a/lib/libv4lconvert/rgbyuv.c b/lib/libv4lconvert/rgbyuv.c
index d05abe9..bef034f 100644
--- a/lib/libv4lconvert/rgbyuv.c
+++ b/lib/libv4lconvert/rgbyuv.c
@@ -586,6 +586,36 @@ void v4lconvert_rgb565_to_yuv420(const unsigned char *src, unsigned char *dest,
}
}
+void v4lconvert_y16_to_rgb24(const unsigned char *src, unsigned char *dest,
+ int width, int height)
+{
+ int j;
+ while (--height >= 0) {
+ for (j = 0; j < width; j++) {
+ *dest++ = *src;
+ *dest++ = *src;
+ *dest++ = *src;
+ src+=2;
+ }
+ }
+}
+
+void v4lconvert_y16_to_yuv420(const unsigned char *src, unsigned char *dest,
+ const struct v4l2_format *src_fmt)
+{
+ int x, y;
+
+ /* Y */
+ for (y = 0; y < src_fmt->fmt.pix.height; y++)
+ for (x = 0; x < src_fmt->fmt.pix.width; x++){
+ *dest++ = *src;
+ src+=2;
+ }
+
+ /* Clear U/V */
+ memset(dest, 0x80, src_fmt->fmt.pix.width * src_fmt->fmt.pix.height / 2);
+}
+
void v4lconvert_grey_to_rgb24(const unsigned char *src, unsigned char *dest,
int width, int height)
{
--
1.7.10.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] libv4lconvert: Support for RGB32 and BGR32 format
2013-08-01 13:04 [PATCH 0/2] Add support for V4L2_PIX_FMT_Y16, V4L2_PIX_FMT_RGB32 and V4L2_PIX_FMT_BGR32 Ricardo Ribalda Delgado
2013-08-01 13:04 ` [PATCH 1/2] libv4lconvert: Support for Y16 pixel format Ricardo Ribalda Delgado
@ 2013-08-01 13:04 ` Ricardo Ribalda Delgado
2013-08-02 22:15 ` Gregor Jasny
1 sibling, 1 reply; 5+ messages in thread
From: Ricardo Ribalda Delgado @ 2013-08-01 13:04 UTC (permalink / raw)
To: hans.verkuil, linux-media; +Cc: Ricardo Ribalda Delgado
This patch adds support for V4L2_PIX_FMT_BGR32 and V4L2_PIX_FMT_BGR32
formats.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
lib/libv4lconvert/libv4lconvert-priv.h | 5 ++-
lib/libv4lconvert/libv4lconvert.c | 58 +++++++++++++++++++++++++---
lib/libv4lconvert/rgbyuv.c | 66 ++++++++++++++++++++++++++------
3 files changed, 111 insertions(+), 18 deletions(-)
diff --git a/lib/libv4lconvert/libv4lconvert-priv.h b/lib/libv4lconvert/libv4lconvert-priv.h
index 6422fdd..2f411ea 100644
--- a/lib/libv4lconvert/libv4lconvert-priv.h
+++ b/lib/libv4lconvert/libv4lconvert-priv.h
@@ -108,7 +108,7 @@ unsigned char *v4lconvert_alloc_buffer(int needed,
int v4lconvert_oom_error(struct v4lconvert_data *data);
void v4lconvert_rgb24_to_yuv420(const unsigned char *src, unsigned char *dest,
- const struct v4l2_format *src_fmt, int bgr, int yvu);
+ const struct v4l2_format *src_fmt, int bgr, int yvu, int rgb32);
void v4lconvert_yuv420_to_rgb24(const unsigned char *src, unsigned char *dst,
int width, int height, int yvu);
@@ -158,6 +158,9 @@ void v4lconvert_y16_to_rgb24(const unsigned char *src, unsigned char *dest,
void v4lconvert_y16_to_yuv420(const unsigned char *src, unsigned char *dest,
const struct v4l2_format *src_fmt);
+void v4lconvert_rgb32_to_rgb24(const unsigned char *src, unsigned char *dest,
+ int width, int height, int bgr);
+
int v4lconvert_y10b_to_rgb24(struct v4lconvert_data *data,
const unsigned char *src, unsigned char *dest, int width, int height);
diff --git a/lib/libv4lconvert/libv4lconvert.c b/lib/libv4lconvert/libv4lconvert.c
index bc5e34f..a5ada5b 100644
--- a/lib/libv4lconvert/libv4lconvert.c
+++ b/lib/libv4lconvert/libv4lconvert.c
@@ -84,6 +84,8 @@ static const struct v4lconvert_pixfmt supported_src_pixfmts[] = {
SUPPORTED_DST_PIXFMTS,
/* packed rgb formats */
{ V4L2_PIX_FMT_RGB565, 16, 4, 6, 0 },
+ { V4L2_PIX_FMT_BGR32, 32, 4, 6, 0 },
+ { V4L2_PIX_FMT_RGB32, 32, 4, 6, 0 },
/* yuv 4:2:2 formats */
{ V4L2_PIX_FMT_YUYV, 16, 5, 4, 0 },
{ V4L2_PIX_FMT_YVYU, 16, 5, 4, 0 },
@@ -981,10 +983,10 @@ static int v4lconvert_convert_pixfmt(struct v4lconvert_data *data,
v4lconvert_swap_rgb(d, dest, width, height);
break;
case V4L2_PIX_FMT_YUV420:
- v4lconvert_rgb24_to_yuv420(d, dest, fmt, 0, 0);
+ v4lconvert_rgb24_to_yuv420(d, dest, fmt, 0, 0, 0);
break;
case V4L2_PIX_FMT_YVU420:
- v4lconvert_rgb24_to_yuv420(d, dest, fmt, 0, 1);
+ v4lconvert_rgb24_to_yuv420(d, dest, fmt, 0, 1, 0);
break;
}
break;
@@ -1079,10 +1081,10 @@ static int v4lconvert_convert_pixfmt(struct v4lconvert_data *data,
v4lconvert_swap_rgb(src, dest, width, height);
break;
case V4L2_PIX_FMT_YUV420:
- v4lconvert_rgb24_to_yuv420(src, dest, fmt, 0, 0);
+ v4lconvert_rgb24_to_yuv420(src, dest, fmt, 0, 0, 0);
break;
case V4L2_PIX_FMT_YVU420:
- v4lconvert_rgb24_to_yuv420(src, dest, fmt, 0, 1);
+ v4lconvert_rgb24_to_yuv420(src, dest, fmt, 0, 1, 0);
break;
}
if (src_size < (width * height * 3)) {
@@ -1101,10 +1103,10 @@ static int v4lconvert_convert_pixfmt(struct v4lconvert_data *data,
memcpy(dest, src, width * height * 3);
break;
case V4L2_PIX_FMT_YUV420:
- v4lconvert_rgb24_to_yuv420(src, dest, fmt, 1, 0);
+ v4lconvert_rgb24_to_yuv420(src, dest, fmt, 1, 0, 0);
break;
case V4L2_PIX_FMT_YVU420:
- v4lconvert_rgb24_to_yuv420(src, dest, fmt, 1, 1);
+ v4lconvert_rgb24_to_yuv420(src, dest, fmt, 1, 1, 0);
break;
}
if (src_size < (width * height * 3)) {
@@ -1114,6 +1116,50 @@ static int v4lconvert_convert_pixfmt(struct v4lconvert_data *data,
}
break;
+ case V4L2_PIX_FMT_RGB32:
+ switch (dest_pix_fmt) {
+ case V4L2_PIX_FMT_RGB24:
+ v4lconvert_rgb32_to_rgb24(src, dest, width, height, 0);
+ break;
+ case V4L2_PIX_FMT_BGR24:
+ v4lconvert_rgb32_to_rgb24(src, dest, width, height, 1);
+ break;
+ case V4L2_PIX_FMT_YUV420:
+ v4lconvert_rgb24_to_yuv420(src, dest, fmt, 0, 0, 1);
+ break;
+ case V4L2_PIX_FMT_YVU420:
+ v4lconvert_rgb24_to_yuv420(src, dest, fmt, 0, 1, 1);
+ break;
+ }
+ if (src_size < (width * height * 4)) {
+ V4LCONVERT_ERR("short rgb32 data frame\n");
+ errno = EPIPE;
+ result = -1;
+ }
+ break;
+
+ case V4L2_PIX_FMT_BGR32:
+ switch (dest_pix_fmt) {
+ case V4L2_PIX_FMT_RGB24:
+ v4lconvert_rgb32_to_rgb24(src, dest, width, height, 1);
+ break;
+ case V4L2_PIX_FMT_BGR24:
+ v4lconvert_rgb32_to_rgb24(src, dest, width, height, 0);
+ break;
+ case V4L2_PIX_FMT_YUV420:
+ v4lconvert_rgb24_to_yuv420(src, dest, fmt, 1, 0, 1);
+ break;
+ case V4L2_PIX_FMT_YVU420:
+ v4lconvert_rgb24_to_yuv420(src, dest, fmt, 1, 1, 1);
+ break;
+ }
+ if (src_size < (width * height * 4)) {
+ V4LCONVERT_ERR("short bgr32 data frame\n");
+ errno = EPIPE;
+ result = -1;
+ }
+ break;
+
case V4L2_PIX_FMT_YUV420:
switch (dest_pix_fmt) {
case V4L2_PIX_FMT_RGB24:
diff --git a/lib/libv4lconvert/rgbyuv.c b/lib/libv4lconvert/rgbyuv.c
index bef034f..7d543d6 100644
--- a/lib/libv4lconvert/rgbyuv.c
+++ b/lib/libv4lconvert/rgbyuv.c
@@ -35,7 +35,7 @@
} while (0)
void v4lconvert_rgb24_to_yuv420(const unsigned char *src, unsigned char *dest,
- const struct v4l2_format *src_fmt, int bgr, int yvu)
+ const struct v4l2_format *src_fmt, int bgr, int yvu, int rgb32)
{
int x, y;
unsigned char *udest, *vdest;
@@ -47,9 +47,15 @@ void v4lconvert_rgb24_to_yuv420(const unsigned char *src, unsigned char *dest,
RGB2Y(src[2], src[1], src[0], *dest++);
else
RGB2Y(src[0], src[1], src[2], *dest++);
- src += 3;
+ if (rgb32)
+ src += 4;
+ else
+ src += 3;
}
- src += src_fmt->fmt.pix.bytesperline - 3 * src_fmt->fmt.pix.width;
+ if (rgb32)
+ src += src_fmt->fmt.pix.bytesperline - 4 * src_fmt->fmt.pix.width;
+ else
+ src += src_fmt->fmt.pix.bytesperline - 3 * src_fmt->fmt.pix.width;
}
src -= src_fmt->fmt.pix.height * src_fmt->fmt.pix.bytesperline;
@@ -66,19 +72,35 @@ void v4lconvert_rgb24_to_yuv420(const unsigned char *src, unsigned char *dest,
for (x = 0; x < src_fmt->fmt.pix.width / 2; x++) {
int avg_src[3];
- avg_src[0] = (src[0] + src[3] + src[src_fmt->fmt.pix.bytesperline] +
- src[src_fmt->fmt.pix.bytesperline + 3]) / 4;
- avg_src[1] = (src[1] + src[4] + src[src_fmt->fmt.pix.bytesperline + 1] +
- src[src_fmt->fmt.pix.bytesperline + 4]) / 4;
- avg_src[2] = (src[2] + src[5] + src[src_fmt->fmt.pix.bytesperline + 2] +
- src[src_fmt->fmt.pix.bytesperline + 5]) / 4;
+ if (rgb32) {
+ avg_src[0] = (src[0] + src[3] + src[src_fmt->fmt.pix.bytesperline] +
+ src[src_fmt->fmt.pix.bytesperline + 3]) / 4;
+ avg_src[1] = (src[1] + src[4] + src[src_fmt->fmt.pix.bytesperline + 1] +
+ src[src_fmt->fmt.pix.bytesperline + 4]) / 4;
+ avg_src[2] = (src[2] + src[5] + src[src_fmt->fmt.pix.bytesperline + 2] +
+ src[src_fmt->fmt.pix.bytesperline + 5]) / 4;
+ }
+ else{
+ avg_src[0] = (src[0] + src[4] + src[src_fmt->fmt.pix.bytesperline] +
+ src[src_fmt->fmt.pix.bytesperline + 4]) / 4;
+ avg_src[1] = (src[1] + src[5] + src[src_fmt->fmt.pix.bytesperline + 1] +
+ src[src_fmt->fmt.pix.bytesperline + 5]) / 4;
+ avg_src[2] = (src[2] + src[6] + src[src_fmt->fmt.pix.bytesperline + 2] +
+ src[src_fmt->fmt.pix.bytesperline + 6]) / 4;
+ }
if (bgr)
RGB2UV(avg_src[2], avg_src[1], avg_src[0], *udest++, *vdest++);
else
RGB2UV(avg_src[0], avg_src[1], avg_src[2], *udest++, *vdest++);
- src += 6;
+ if (rgb32)
+ src += 8;
+ else
+ src += 6;
}
- src += 2 * src_fmt->fmt.pix.bytesperline - 3 * src_fmt->fmt.pix.width;
+ if (rgb32)
+ src += 2 * src_fmt->fmt.pix.bytesperline - 4 * src_fmt->fmt.pix.width;
+ else
+ src += 2 * src_fmt->fmt.pix.bytesperline - 3 * src_fmt->fmt.pix.width;
}
}
@@ -725,3 +747,25 @@ int v4lconvert_y10b_to_yuv420(struct v4lconvert_data *data,
return 0;
}
+
+void v4lconvert_rgb32_to_rgb24(const unsigned char *src, unsigned char *dest,
+ int width, int height,int bgr)
+{
+ int j;
+ while (--height >= 0) {
+ for (j = 0; j < width; j++) {
+ if (bgr){
+ *dest++ = src[2];
+ *dest++ = src[1];
+ *dest++ = src[0];
+ src+=4;
+ }
+ else{
+ *dest++ = *src++;
+ *dest++ = *src++;
+ *dest++ = *src++;
+ src+=1;
+ }
+ }
+ }
+}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] libv4lconvert: Support for RGB32 and BGR32 format
2013-08-01 13:04 ` [PATCH 2/2] libv4lconvert: Support for RGB32 and BGR32 format Ricardo Ribalda Delgado
@ 2013-08-02 22:15 ` Gregor Jasny
2013-08-02 22:43 ` Ricardo Ribalda Delgado
0 siblings, 1 reply; 5+ messages in thread
From: Gregor Jasny @ 2013-08-02 22:15 UTC (permalink / raw)
To: Ricardo Ribalda Delgado; +Cc: linux-media
Hello,
On 8/1/13 3:04 PM, Ricardo Ribalda Delgado wrote:
> --- a/lib/libv4lconvert/libv4lconvert-priv.h
> +++ b/lib/libv4lconvert/libv4lconvert-priv.h
> @@ -108,7 +108,7 @@ unsigned char *v4lconvert_alloc_buffer(int needed,
> int v4lconvert_oom_error(struct v4lconvert_data *data);
>
> void v4lconvert_rgb24_to_yuv420(const unsigned char *src, unsigned char *dest,
> - const struct v4l2_format *src_fmt, int bgr, int yvu);
> + const struct v4l2_format *src_fmt, int bgr, int yvu, int rgb32);
>
> void v4lconvert_yuv420_to_rgb24(const unsigned char *src, unsigned char *dst,
> int width, int height, int yvu);
> @@ -47,9 +47,15 @@ void v4lconvert_rgb24_to_yuv420(const unsigned char *src, unsigned char *dest,
> RGB2Y(src[2], src[1], src[0], *dest++);
> else
> RGB2Y(src[0], src[1], src[2], *dest++);
> - src += 3;
> + if (rgb32)
> + src += 4;
> + else
> + src += 3;
Instead of passing a 0/1 flag here I would call this variable
bits_per_pixel or bpp and pass 3 or 4 here. This would reduce the if
condition ugliness.
Thanks,
Gregor
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] libv4lconvert: Support for RGB32 and BGR32 format
2013-08-02 22:15 ` Gregor Jasny
@ 2013-08-02 22:43 ` Ricardo Ribalda Delgado
0 siblings, 0 replies; 5+ messages in thread
From: Ricardo Ribalda Delgado @ 2013-08-02 22:43 UTC (permalink / raw)
To: Gregor Jasny; +Cc: linux-media
Hello Gregor
Totally agree,
I have just uploaded a new set.
Thanks!
On Sat, Aug 3, 2013 at 12:15 AM, Gregor Jasny <gjasny@googlemail.com> wrote:
> Hello,
>
>
> On 8/1/13 3:04 PM, Ricardo Ribalda Delgado wrote:
>>
>> --- a/lib/libv4lconvert/libv4lconvert-priv.h
>> +++ b/lib/libv4lconvert/libv4lconvert-priv.h
>> @@ -108,7 +108,7 @@ unsigned char *v4lconvert_alloc_buffer(int needed,
>> int v4lconvert_oom_error(struct v4lconvert_data *data);
>>
>> void v4lconvert_rgb24_to_yuv420(const unsigned char *src, unsigned char
>> *dest,
>> - const struct v4l2_format *src_fmt, int bgr, int yvu);
>> + const struct v4l2_format *src_fmt, int bgr, int yvu, int
>> rgb32);
>>
>> void v4lconvert_yuv420_to_rgb24(const unsigned char *src, unsigned char
>> *dst,
>> int width, int height, int yvu);
>
>
>> @@ -47,9 +47,15 @@ void v4lconvert_rgb24_to_yuv420(const unsigned char
>> *src, unsigned char *dest,
>> RGB2Y(src[2], src[1], src[0], *dest++);
>> else
>> RGB2Y(src[0], src[1], src[2], *dest++);
>> - src += 3;
>> + if (rgb32)
>> + src += 4;
>> + else
>> + src += 3;
>
>
> Instead of passing a 0/1 flag here I would call this variable bits_per_pixel
> or bpp and pass 3 or 4 here. This would reduce the if condition ugliness.
>
> Thanks,
> Gregor
>
--
Ricardo Ribalda
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-08-02 22:43 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-01 13:04 [PATCH 0/2] Add support for V4L2_PIX_FMT_Y16, V4L2_PIX_FMT_RGB32 and V4L2_PIX_FMT_BGR32 Ricardo Ribalda Delgado
2013-08-01 13:04 ` [PATCH 1/2] libv4lconvert: Support for Y16 pixel format Ricardo Ribalda Delgado
2013-08-01 13:04 ` [PATCH 2/2] libv4lconvert: Support for RGB32 and BGR32 format Ricardo Ribalda Delgado
2013-08-02 22:15 ` Gregor Jasny
2013-08-02 22:43 ` Ricardo Ribalda Delgado
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.