V4L/DVB (8194): gspca: Fix the format of the low resolution mode of spca561.

The low (half) res modes of the spca561 are not spca561 compressed, but are
raw bayer, this patches fixes this and adds a PIX_FMT define for the GBRG
bayer format used by the spca561 in low res mode.

Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c
index a94e6270115e3e1e621b421b5037f1b5c78aed7c..dbd1648a655fa16f64a2b3630df7d615180096a8 100644 (file)
--- a/drivers/media/video/gspca/spca561.c
+++ b/drivers/media/video/gspca/spca561.c
@@ -98,8 +98,8 @@ static struct ctrl sd_ctrls[] = {
 };
 
 static struct cam_mode sif_mode[] = {
-       {V4L2_PIX_FMT_SPCA561, 160, 120, 3},
-       {V4L2_PIX_FMT_SPCA561, 176, 144, 2},
+       {V4L2_PIX_FMT_SGBRG8, 160, 120, 3},
+       {V4L2_PIX_FMT_SGBRG8, 176, 144, 2},
        {V4L2_PIX_FMT_SPCA561, 320, 240, 1},
        {V4L2_PIX_FMT_SPCA561, 352, 288, 0},
 };
@@ -808,7 +808,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                        gspca_frame_add(gspca_dev, FIRST_PACKET,
                                        frame, data, len);
                } else {
-                       /*fixme: which format?*/
+                       /* raw bayer (with a header, which we skip) */
                        data += 20;
                        len -= 20;
                        gspca_frame_add(gspca_dev, FIRST_PACKET,

diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 43a6c81a53ef384f68e0a938554c470cf78cf129..577f15634791f55ff9f182f3a80241bbf7dada78 100644 (file)
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -310,6 +310,7 @@ struct v4l2_pix_format
 
 /* see http://www.siliconimaging.com/RGB%20Bayer.htm */
 #define V4L2_PIX_FMT_SBGGR8  v4l2_fourcc('B','A','8','1') /*  8  BGBG.. GRGR.. */
+#define V4L2_PIX_FMT_SGBRG8  v4l2_fourcc('G','B','R','G') /*  8  GBGB.. RGRG.. */
 #define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B','Y','R','2') /* 16  BGBG.. GRGR.. */
 
 /* compressed formats */