diff options
| author | Devin Heitmueller <dheitmueller@linuxtv.org> | 2008-12-29 21:34:37 -0500 |
|---|---|---|
| committer | Devin Heitmueller <dheitmueller@linuxtv.org> | 2008-12-29 21:34:37 -0500 |
| commit | 87fe61efe9940db733854a3b4f80401de8eec3fb (patch) | |
| tree | bdf3fcdc5fddd4d655b32dd42813765cd879eeba | |
| parent | 8811c386c4bb95b9d444b7df58fb45fa10736e97 (diff) | |
| download | mediapointer-dvb-s2-87fe61efe9940db733854a3b4f80401de8eec3fb.tar.gz mediapointer-dvb-s2-87fe61efe9940db733854a3b4f80401de8eec3fb.tar.bz2 | |
em28xx: expand output formats available
From: Devin Heitmueller <dheitmueller@linuxtv.org>
Add additional output formats, which will be useful for the Pinnacle PCTV
Ultimate 880e integration with the saa7136.
Thanks to Ray Lu from Empia for providing the em2860/em2880 datasheet.
Priority: normal
Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-reg.h | 13 | ||||
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-video.c | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-reg.h b/linux/drivers/media/video/em28xx/em28xx-reg.h index 2e8767583..65dcb91bd 100644 --- a/linux/drivers/media/video/em28xx/em28xx-reg.h +++ b/linux/drivers/media/video/em28xx/em28xx-reg.h @@ -97,6 +97,19 @@ #define EM28XX_R26_COMPR 0x26 #define EM28XX_R27_OUTFMT 0x27 +/* em28xx Output Format Register (0x27) */ +#define EM28XX_OUTFMT_RGB_8_RGRG 0x00 +#define EM28XX_OUTFMT_RGB_8_GRGR 0x01 +#define EM28XX_OUTFMT_RGB_8_GBGB 0x02 +#define EM28XX_OUTFMT_RGB_8_BGBG 0x03 +#define EM28XX_OUTFMT_RGB_16_656 0x04 +#define EM28XX_OUTFMT_RGB_8_BAYER 0x08 /* Pattern in Reg 0x10[1-0] */ +#define EM28XX_OUTFMT_YUV211 0x10 +#define EM28XX_OUTFMT_YUV422_Y0UY1V 0x14 +#define EM28XX_OUTFMT_YUV422_Y1UY0V 0x15 +#define EM28XX_OUTFMT_YUV411 0x18 + + #define EM28XX_R28_XMIN 0x28 #define EM28XX_R29_XMAX 0x29 #define EM28XX_R2A_YMIN 0x2a diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c index 8be7aadac..fe6b6f142 100644 --- a/linux/drivers/media/video/em28xx/em28xx-video.c +++ b/linux/drivers/media/video/em28xx/em28xx-video.c @@ -93,7 +93,7 @@ static struct em28xx_fmt format[] = { .name = "16bpp YUY2, 4:2:2, packed", .fourcc = V4L2_PIX_FMT_YUYV, .depth = 16, - .reg = 0x14, + .reg = EM28XX_OUTFMT_YUV422_Y0UY1V, }, }; |