From: Hans Verkuil Date: Fri, 29 Jul 2011 10:19:46 +0000 (-0300) Subject: [media] vivi: fill in colorspace X-Git-Tag: MMI-PSA29.97-13-9~18177^2~223 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8c79eecebb730de8c0610d2b79a6a10e51106ba4;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [media] vivi: fill in colorspace The colorspace was never filled in, causing complaints from v4l2-compliance. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index a848bd2af97f..b3ae1ba97fc6 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; }