---

yaml --- r: 103917 b: refs/heads/master c: 54ab92c h: refs/heads/master i: 103915: 6ed5c9d v: v3
git-mirror · Jul 20, 2008 · 3f8d294 · 3f8d294
1 parent 0316d11
commit 3f8d294
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf7f0b98426b54c29ec8100a3f1963114c2f2ef0
+refs/heads/master: 54ab92ca05550550bcec2462de2605f35d079b66
diff --git a/trunk/drivers/media/video/gspca/spca561.c b/trunk/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/trunk/include/linux/videodev2.h b/trunk/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 */