The patch number 8158 was added via Jean-Francois Moine <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Jean-Francois Moine <[EMAIL PROTECTED]>
gspca: minor changes
main: V4L2_PIX_FMT_SPCA501 is compressed (thanks to Hans de Goede)
main: return 0 when no change on vidioc_s_fmt_cap (thanks to Hans de Goede)
pac207: cleanup
Signed-off-by: Jean-Francois Moine <[EMAIL PROTECTED]>
---
linux/drivers/media/video/gspca/gspca.c | 7 +++++--
linux/drivers/media/video/gspca/pac207.c | 10 ++++++----
2 files changed, 11 insertions(+), 6 deletions(-)
diff -r 915ca96f9b4a -r 4bc068802c9f linux/drivers/media/video/gspca/gspca.c
--- a/linux/drivers/media/video/gspca/gspca.c Mon Jun 30 17:50:11 2008 +0200
+++ b/linux/drivers/media/video/gspca/gspca.c Mon Jun 30 21:47:33 2008 +0200
@@ -322,6 +322,7 @@ static int gspca_is_compressed(__u32 for
switch (format) {
case V4L2_PIX_FMT_MJPEG:
case V4L2_PIX_FMT_JPEG:
+ case V4L2_PIX_FMT_SPCA561:
return 1;
}
return 0;
@@ -375,12 +376,12 @@ static __u32 get_v4l2_depth(__u32 pixfmt
case V4L2_PIX_FMT_YYUV: /* 'YYUV' */
return 16;
case V4L2_PIX_FMT_YUV420: /* 'YU12' planar 4.2.0 */
+ case V4L2_PIX_FMT_SPCA501: /* 'S501' YUYV per line */
return 12;
case V4L2_PIX_FMT_MJPEG:
case V4L2_PIX_FMT_JPEG:
case V4L2_PIX_FMT_SBGGR8: /* 'BA81' Bayer */
case V4L2_PIX_FMT_SN9C10X: /* 'S910' SN9C10x compression */
- case V4L2_PIX_FMT_SPCA501: /* 'S501' YUYV per line */
case V4L2_PIX_FMT_SPCA561: /* 'S561' compressed BGGR bayer */
return 8;
}
@@ -919,8 +920,10 @@ static int vidioc_s_fmt_cap(struct file
goto out;
}
- if (ret == gspca_dev->curr_mode)
+ if (ret == gspca_dev->curr_mode) {
+ ret = 0;
goto out; /* same mode */
+ }
if (gspca_dev->streaming) {
ret = -EBUSY;
diff -r 915ca96f9b4a -r 4bc068802c9f linux/drivers/media/video/gspca/pac207.c
--- a/linux/drivers/media/video/gspca/pac207.c Mon Jun 30 17:50:11 2008 +0200
+++ b/linux/drivers/media/video/gspca/pac207.c Mon Jun 30 21:47:33 2008 +0200
@@ -492,7 +492,7 @@ static void pac207_do_auto_gain(struct g
}
static unsigned char *pac207_find_sof(struct gspca_dev *gspca_dev,
- unsigned char *m, int len)
+ unsigned char *m, int len)
{
struct sd *sd = (struct sd *) gspca_dev;
int i;
@@ -518,7 +518,9 @@ static unsigned char *pac207_find_sof(st
}
static int pac207_decompress_row(struct gspca_dev *gspca_dev,
- struct gspca_frame *f, unsigned char *cdata, int len)
+ struct gspca_frame *f,
+ __u8 *cdata,
+ int len)
{
struct sd *sd = (struct sd *) gspca_dev;
struct pac207_decoder_state *decoder_state = &sd->decoder_state;
@@ -667,10 +669,10 @@ static int pac207_decode_frame_data(stru
case LINE_HEADER2:
decoder_state->line_marker |= data[0];
switch (decoder_state->line_marker) {
- case 0x0FF0:
+ case 0x0ff0:
decoder_state->line_state = LINE_UNCOMPRESSED;
break;
- case 0x1EE1:
+ case 0x1ee1:
decoder_state->line_state = LINE_COMPRESSED;
break;
default:
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/4bc068802c9fff66c1e73167a8377de7385b5320
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
