summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhans@rhel5-devel.localdomain <hans@rhel5-devel.localdomain>2009-07-03 10:59:47 +0200
committerhans@rhel5-devel.localdomain <hans@rhel5-devel.localdomain>2009-07-03 10:59:47 +0200
commit2cc1e944209c3eccf7ff91ce2a7f5294dde68dd5 (patch)
treea36dd77624fbdc9b85e915a38c58840234db0646
parentc0be22d7a52d1be4f6948bdd43eaea9f0e284528 (diff)
downloadmediapointer-dvb-s2-2cc1e944209c3eccf7ff91ce2a7f5294dde68dd5.tar.gz
mediapointer-dvb-s2-2cc1e944209c3eccf7ff91ce2a7f5294dde68dd5.tar.bz2
libv4l: add support for RGB565 format
From: Mauro Carvalho Chehab <mchehab@redhat.com> Currently, em28xx driver outputs webcams only at RGB565 format. However, several webcam applications don't support this format. In order to properly work with those applications, a RGB565 handler should be added at libv4l. Tested with Silvercrest 1.3 mpix with v4l2grab (V4L2, with native libv4l support) and two LD_PRELOAD applications: camorama (V4L1 API) and skype (using compat32). Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-rw-r--r--v4l2-apps/libv4l/libv4lconvert/libv4lconvert-priv.h9
-rw-r--r--v4l2-apps/libv4l/libv4lconvert/libv4lconvert.c18
-rw-r--r--v4l2-apps/libv4l/libv4lconvert/rgbyuv.c104
3 files changed, 130 insertions, 1 deletions
diff --git a/v4l2-apps/libv4l/libv4lconvert/libv4lconvert-priv.h b/v4l2-apps/libv4l/libv4lconvert/libv4lconvert-priv.h
index 2cf8f6ba4..d8a09c24a 100644
--- a/v4l2-apps/libv4l/libv4lconvert/libv4lconvert-priv.h
+++ b/v4l2-apps/libv4l/libv4lconvert/libv4lconvert-priv.h
@@ -184,6 +184,15 @@ void v4lconvert_swap_rgb(const unsigned char *src, unsigned char *dst,
void v4lconvert_swap_uv(const unsigned char *src, unsigned char *dst,
const struct v4l2_format *src_fmt);
+void v4lconvert_rgb565_to_rgb24(const unsigned char *src, unsigned char *dest,
+ int width, int height);
+
+void v4lconvert_rgb565_to_bgr24(const unsigned char *src, unsigned char *dest,
+ int width, int height);
+
+void v4lconvert_rgb565_to_yuv420(const unsigned char *src, unsigned char *dest,
+ const struct v4l2_format *src_fmt, int yvu);
+
void v4lconvert_spca501_to_yuv420(const unsigned char *src, unsigned char *dst,
int width, int height, int yvu);
diff --git a/v4l2-apps/libv4l/libv4lconvert/libv4lconvert.c b/v4l2-apps/libv4l/libv4lconvert/libv4lconvert.c
index 1389c58bc..4422ce084 100644
--- a/v4l2-apps/libv4l/libv4lconvert/libv4lconvert.c
+++ b/v4l2-apps/libv4l/libv4lconvert/libv4lconvert.c
@@ -46,6 +46,7 @@ static const struct v4lconvert_pixfmt supported_src_pixfmts[] = {
{ V4L2_PIX_FMT_YUYV, 0 },
{ V4L2_PIX_FMT_YVYU, 0 },
{ V4L2_PIX_FMT_UYVY, 0 },
+ { V4L2_PIX_FMT_RGB565, 0 },
{ V4L2_PIX_FMT_SN9C20X_I420, V4LCONVERT_NEEDS_CONVERSION },
{ V4L2_PIX_FMT_SBGGR8, V4LCONVERT_NEEDS_CONVERSION },
{ V4L2_PIX_FMT_SGBRG8, V4LCONVERT_NEEDS_CONVERSION },
@@ -787,6 +788,23 @@ static int v4lconvert_convert_pixfmt(struct v4lconvert_data *data,
}
break;
+ case V4L2_PIX_FMT_RGB565:
+ switch (dest_pix_fmt) {
+ case V4L2_PIX_FMT_RGB24:
+ v4lconvert_rgb565_to_rgb24(src, dest, width, height);
+ break;
+ case V4L2_PIX_FMT_BGR24:
+ v4lconvert_rgb565_to_bgr24(src, dest, width, height);
+ break;
+ case V4L2_PIX_FMT_YUV420:
+ v4lconvert_rgb565_to_yuv420(src, dest, fmt, 0);
+ break;
+ case V4L2_PIX_FMT_YVU420:
+ v4lconvert_rgb565_to_yuv420(src, dest, fmt, 1);
+ break;
+ }
+ break;
+
case V4L2_PIX_FMT_RGB24:
switch (dest_pix_fmt) {
case V4L2_PIX_FMT_BGR24:
diff --git a/v4l2-apps/libv4l/libv4lconvert/rgbyuv.c b/v4l2-apps/libv4l/libv4lconvert/rgbyuv.c
index 31cbc3c68..66fd3ee60 100644
--- a/v4l2-apps/libv4l/libv4lconvert/rgbyuv.c
+++ b/v4l2-apps/libv4l/libv4lconvert/rgbyuv.c
@@ -1,9 +1,11 @@
/*
# RGB <-> YUV conversion routines
-
# (C) 2008 Hans de Goede <j.w.r.degoede@hhs.nl>
+# RGB565 conversion routines
+# (C) 2009 Mauro Carvalho Chehab <mchehab@redhat.com>
+
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
@@ -472,3 +474,103 @@ void v4lconvert_swap_uv(const unsigned char *src, unsigned char *dest,
src += src_fmt->fmt.pix.bytesperline / 2;
}
}
+
+void v4lconvert_rgb565_to_rgb24(const unsigned char *src, unsigned char *dest,
+ int width, int height)
+{
+ int j;
+ while (--height >= 0) {
+ for (j = 0; j < width; j++) {
+ unsigned short tmp = *(unsigned short *)src;
+
+ /* Original format: rrrrrggg gggbbbbb */
+ *dest++ = 0xf8 & (tmp >> 8);
+ *dest++ = 0xfc & (tmp >> 3);
+ *dest++ = 0xf8 & (tmp << 3);
+
+ src += 2;
+ }
+ }
+}
+
+void v4lconvert_rgb565_to_bgr24(const unsigned char *src, unsigned char *dest,
+ int width, int height)
+{
+ int j;
+ while (--height >= 0) {
+ for (j = 0; j < width; j++) {
+ unsigned short tmp = *(unsigned short *)src;
+
+ /* Original format: rrrrrggg gggbbbbb */
+ *dest++ = 0xf8 & (tmp << 3);
+ *dest++ = 0xfc & (tmp >> 3);
+ *dest++ = 0xf8 & (tmp >> 8);
+
+ src += 2;
+ }
+ }
+}
+
+void v4lconvert_rgb565_to_yuv420(const unsigned char *src, unsigned char *dest,
+ const struct v4l2_format *src_fmt, int yvu)
+{
+ int x, y;
+ unsigned short tmp;
+ unsigned char *udest, *vdest;
+ unsigned r[4], g[4], b[4];
+ int avg_src[3];
+
+ /* Y */
+ for (y = 0; y < src_fmt->fmt.pix.height; y++) {
+ for (x = 0; x < src_fmt->fmt.pix.width; x++) {
+ tmp = *(unsigned short *)src;
+ r[0] = 0xf8 & (tmp << 3);
+ g[0] = 0xfc & (tmp >> 3);
+ b[0] = 0xf8 & (tmp >> 8);
+ RGB2Y(r[0], g[0], b[0], *dest++);
+ src += 2;
+ }
+ src += src_fmt->fmt.pix.bytesperline - 2 * src_fmt->fmt.pix.width;
+ }
+ src -= src_fmt->fmt.pix.height * src_fmt->fmt.pix.bytesperline;
+
+ /* U + V */
+ if (yvu) {
+ vdest = dest;
+ udest = dest + src_fmt->fmt.pix.width * src_fmt->fmt.pix.height / 4;
+ } else {
+ udest = dest;
+ vdest = dest + src_fmt->fmt.pix.width * src_fmt->fmt.pix.height / 4;
+ }
+
+ for (y = 0; y < src_fmt->fmt.pix.height / 2; y++) {
+ for (x = 0; x < src_fmt->fmt.pix.width / 2; x++) {
+ tmp = *(unsigned short *)src;
+ r[0] = 0xf8 & (tmp << 3);
+ g[0] = 0xfc & (tmp >> 3);
+ b[0] = 0xf8 & (tmp >> 8);
+
+ tmp = *(((unsigned short *)src) + 1);
+ r[1] = 0xf8 & (tmp << 3);
+ g[1] = 0xfc & (tmp >> 3);
+ b[1] = 0xf8 & (tmp >> 8);
+
+ tmp = *(((unsigned short *)src) + src_fmt->fmt.pix.bytesperline);
+ r[2] = 0xf8 & (tmp << 3);
+ g[2] = 0xfc & (tmp >> 3);
+ b[2] = 0xf8 & (tmp >> 8);
+
+ tmp = *(((unsigned short *)src) + src_fmt->fmt.pix.bytesperline + 1);
+ r[3] = 0xf8 & (tmp << 3);
+ g[3] = 0xfc & (tmp >> 3);
+ b[3] = 0xf8 & (tmp >> 8);
+
+ avg_src[0] = (r[0] + r[1] + r[2] + r[3]) /4;
+ avg_src[1] = (g[0] + g[1] + g[2] + g[3]) /4;
+ avg_src[2] = (b[0] + b[1] + b[2] + b[3]) /4;
+ RGB2UV(avg_src[0], avg_src[1], avg_src[2], *udest++, *vdest++);
+ src += 4;
+ }
+ src += 2 * src_fmt->fmt.pix.bytesperline - 2 * src_fmt->fmt.pix.width;
+ }
+}