diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-12 11:35:57 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-12 11:35:57 -0200 |
| commit | b696e4ec6e2f7499a539bbd32eeaaba007df6360 (patch) | |
| tree | b78eef1b75a6daf903bd47c8c130db8c6d5af06a /linux/drivers | |
| parent | 773e7292f316da46fb1080a50f93487e71c08e07 (diff) | |
| download | mediapointer-dvb-s2-b696e4ec6e2f7499a539bbd32eeaaba007df6360.tar.gz mediapointer-dvb-s2-b696e4ec6e2f7499a539bbd32eeaaba007df6360.tar.bz2 | |
VIDEO_PALETTE_YUYV and VIDEO_PALETTE_YUV422 are the same palette
From: audetto@tiscali.it <"audetto@tiscali.it">
Consistent handling of VIDEO_PALETTE_YUYV and VIDEO_PALETTE_YUV422
Signed-off-by: Andrea A Odetti <audetto@tiscali.it>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/meye.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/w9966.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/zoran_device.c | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/linux/drivers/media/video/meye.c b/linux/drivers/media/video/meye.c index 2ee2d9fd0..cec07f5e0 100644 --- a/linux/drivers/media/video/meye.c +++ b/linux/drivers/media/video/meye.c @@ -928,7 +928,7 @@ static int meye_do_ioctl(struct inode *inode, struct file *file, struct video_picture *p = arg; if (p->depth != 16) return -EINVAL; - if (p->palette != VIDEO_PALETTE_YUV422) + if (p->palette != VIDEO_PALETTE_YUV422 && p->palette != VIDEO_PALETTE_YUYV) return -EINVAL; mutex_lock(&meye.lock); sonypi_camera_command(SONYPI_COMMAND_SETCAMERABRIGHTNESS, @@ -983,7 +983,7 @@ static int meye_do_ioctl(struct inode *inode, struct file *file, if (vm->frame >= gbuffers || vm->frame < 0) return -EINVAL; - if (vm->format != VIDEO_PALETTE_YUV422) + if (vm->format != VIDEO_PALETTE_YUV422 && vm->format != VIDEO_PALETTE_YUYV) return -EINVAL; if (vm->height * vm->width * 2 > gbufsize) return -EINVAL; diff --git a/linux/drivers/media/video/w9966.c b/linux/drivers/media/video/w9966.c index 6a5c6303d..11ae53998 100644 --- a/linux/drivers/media/video/w9966.c +++ b/linux/drivers/media/video/w9966.c @@ -790,7 +790,7 @@ static int w9966_v4l_do_ioctl(struct inode *inode, struct file *file, case VIDIOCSPICT: { struct video_picture *vpic = arg; - if (vpic->depth != 16 || vpic->palette != VIDEO_PALETTE_YUV422) + if (vpic->depth != 16 || (vpic->palette != VIDEO_PALETTE_YUV422 && vpic->palette != VIDEO_PALETTE_YUYV)) return -EINVAL; cam->brightness = vpic->brightness >> 8; diff --git a/linux/drivers/media/video/zoran_device.c b/linux/drivers/media/video/zoran_device.c index 72d1e5f14..db0a9bd48 100644 --- a/linux/drivers/media/video/zoran_device.c +++ b/linux/drivers/media/video/zoran_device.c @@ -430,7 +430,7 @@ zr36057_set_vfe (struct zoran *zr, reg |= (HorDcm << ZR36057_VFESPFR_HorDcm); reg |= (VerDcm << ZR36057_VFESPFR_VerDcm); reg |= (DispMode << ZR36057_VFESPFR_DispMode); - if (format->palette != VIDEO_PALETTE_YUV422) + if (format->palette != VIDEO_PALETTE_YUV422 && format->palette != VIDEO_PALETTE_YUYV) reg |= ZR36057_VFESPFR_LittleEndian; /* RJ: I don't know, why the following has to be the opposite * of the corresponding ZR36060 setting, but only this way @@ -442,6 +442,7 @@ zr36057_set_vfe (struct zoran *zr, reg |= ZR36057_VFESPFR_TopField; switch (format->palette) { + case VIDEO_PALETTE_YUYV: case VIDEO_PALETTE_YUV422: reg |= ZR36057_VFESPFR_YUV422; break; |