From d22bc88c25a1a726e3c6e032d8b8d9c5d17c9802 Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Fri, 22 Jan 2010 02:05:24 -0300 Subject: [PATCH] --- yaml --- r: 192835 b: refs/heads/master c: 1744feab9a2241f2adf03be5ef8ecbd279f5944b h: refs/heads/master i: 192833: 6b9534d7f07fb7f5b79b991cfb5e86c7b59ff5ce 192831: 7a5fe2f4227da7aedd1507d281774af23314a5cc v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-core.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 94d7509cbf40..4b01856e84d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33c02facb5a3123212587295cc1c241ee7e03adb +refs/heads/master: 1744feab9a2241f2adf03be5ef8ecbd279f5944b diff --git a/trunk/drivers/media/video/em28xx/em28xx-core.c b/trunk/drivers/media/video/em28xx/em28xx-core.c index a41cc5566778..258041d0be9e 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-core.c +++ b/trunk/drivers/media/video/em28xx/em28xx-core.c @@ -782,11 +782,15 @@ int em28xx_resolution_set(struct em28xx *dev) em28xx_accumulator_set(dev, 1, (width - 4) >> 2, 1, (height - 4) >> 2); - /* If we don't set the start position to 4 in VBI mode, we end up - with line 21 being YUYV encoded instead of being in 8-bit - greyscale */ + /* If we don't set the start position to 2 in VBI mode, we end up + with line 20/21 being YUYV encoded instead of being in 8-bit + greyscale. The core of the issue is that line 21 (and line 23 for + PAL WSS) are inside of active video region, and as a result they + get the pixelformatting associated with that area. So by cropping + it out, we end up with the same format as the rest of the VBI + region */ if (em28xx_vbi_supported(dev) == 1) - em28xx_capture_area_set(dev, 0, 4, width >> 2, height >> 2); + em28xx_capture_area_set(dev, 0, 2, width >> 2, height >> 2); else em28xx_capture_area_set(dev, 0, 0, width >> 2, height >> 2);