diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-07-03 13:20:58 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-07-03 13:20:58 +0200 |
| commit | 7351f3bd89a0d621d0582d8836e04879f58bb68a (patch) | |
| tree | 4bd307aa14610dd2ee7583a8c1de3e4a0d09fccc | |
| parent | 2dd61caa92b3da1a827cf5c84799ee51bd38d869 (diff) | |
| download | mediapointer-dvb-s2-7351f3bd89a0d621d0582d8836e04879f58bb68a.tar.gz mediapointer-dvb-s2-7351f3bd89a0d621d0582d8836e04879f58bb68a.tar.bz2 | |
gspca: Fix the format of the low resolution mode of spca561.
From: Hans de Goede <j.w.r.degoede@hhs.nl>
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>
| -rw-r--r-- | linux/drivers/media/video/gspca/spca561.c | 6 | ||||
| -rw-r--r-- | linux/include/linux/videodev2.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/linux/drivers/media/video/gspca/spca561.c b/linux/drivers/media/video/gspca/spca561.c index a94e62701..dbd1648a6 100644 --- a/linux/drivers/media/video/gspca/spca561.c +++ b/linux/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/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index 716197646..2fda9f68c 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/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 */ |