diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2011-07-29 07:19:46 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-09-06 14:51:00 -0300 |
| commit | 8c79eecebb730de8c0610d2b79a6a10e51106ba4 (patch) | |
| tree | af8f6510a762c783dc8878f47460528f6ff5881b /drivers/media/video/vivi.c | |
| parent | 94238e9b1946a300b7aeb8bc1ab7f55f6f27e225 (diff) | |
| download | linux-3.10-8c79eecebb730de8c0610d2b79a6a10e51106ba4.tar.gz linux-3.10-8c79eecebb730de8c0610d2b79a6a10e51106ba4.tar.bz2 linux-3.10-8c79eecebb730de8c0610d2b79a6a10e51106ba4.zip | |
[media] vivi: fill in colorspace
The colorspace was never filled in, causing complaints from v4l2-compliance.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/vivi.c')
| -rw-r--r-- | drivers/media/video/vivi.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index a848bd2af97..b3ae1ba97fc 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c @@ -852,6 +852,11 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv, (f->fmt.pix.width * dev->fmt->depth) >> 3; f->fmt.pix.sizeimage = f->fmt.pix.height * f->fmt.pix.bytesperline; + if (dev->fmt->fourcc == V4L2_PIX_FMT_YUYV || + dev->fmt->fourcc == V4L2_PIX_FMT_UYVY) + f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M; + else + f->fmt.pix.colorspace = V4L2_COLORSPACE_SRGB; return 0; } @@ -885,6 +890,11 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, (f->fmt.pix.width * fmt->depth) >> 3; f->fmt.pix.sizeimage = f->fmt.pix.height * f->fmt.pix.bytesperline; + if (fmt->fourcc == V4L2_PIX_FMT_YUYV || + fmt->fourcc == V4L2_PIX_FMT_UYVY) + f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M; + else + f->fmt.pix.colorspace = V4L2_COLORSPACE_SRGB; return 0; } |