From 8300c568bf6dc61bcdb8767675dc2ece1d2437fa Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 29 Jul 2011 07:19:46 -0300 Subject: [PATCH] --- yaml --- r: 271759 b: refs/heads/master c: 8c79eecebb730de8c0610d2b79a6a10e51106ba4 h: refs/heads/master i: 271757: fb04810bbb90f928190a39a1f9e889307cf11f7d 271755: cee840c73925e968356732fd2df97f752552b7e7 271751: 91f87026426809d06010dafee3522a85b415450a 271743: 02ff0f03bc248259c692f36b3d161216da2ac604 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/vivi.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f78f98e62d6e..749a182c5383 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94238e9b1946a300b7aeb8bc1ab7f55f6f27e225 +refs/heads/master: 8c79eecebb730de8c0610d2b79a6a10e51106ba4 diff --git a/trunk/drivers/media/video/vivi.c b/trunk/drivers/media/video/vivi.c index a848bd2af97f..b3ae1ba97fc6 100644 --- a/trunk/drivers/media/video/vivi.c +++ b/trunk/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; }