From f02523938ac3f15962b8a5e328caeb92d0d1b612 Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Tue, 23 May 2006 23:54:44 -0300 Subject: [PATCH] --- yaml --- r: 29957 b: refs/heads/master c: 3eb731705556b643df2cbae1bc98976335451548 h: refs/heads/master i: 29955: f961c65d4ece1c27d3b1809432873c83a7d5a492 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx88/cx88-core.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d645a29f79c5..5d8b36917180 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 419ac5d466db4dba3eb6bd79ffe993b4a4e81b4f +refs/heads/master: 3eb731705556b643df2cbae1bc98976335451548 diff --git a/trunk/drivers/media/video/cx88/cx88-core.c b/trunk/drivers/media/video/cx88/cx88-core.c index 2214235f76d3..c56292d8d93b 100644 --- a/trunk/drivers/media/video/cx88/cx88-core.c +++ b/trunk/drivers/media/video/cx88/cx88-core.c @@ -932,9 +932,9 @@ int cx88_set_tvnorm(struct cx88_core *core, struct cx88_tvnorm *norm) htotal, cx_read(MO_HTOTAL), (u32)tmp64); cx_write(MO_HTOTAL, htotal); - // vbi stuff - cx_write(MO_VBI_PACKET, ((1 << 11) | /* (norm_vdelay(norm) << 11) | */ - norm_vbipack(norm))); + // vbi stuff, set vbi offset to 10 (for 20 Clk*2 pixels), this makes + // the effective vbi offset ~244 samples, the same as the Bt8x8 + cx_write(MO_VBI_PACKET, (10<<11) | norm_vbipack(norm)); // this is needed as well to set all tvnorm parameter cx88_set_scale(core, 320, 240, V4L2_FIELD_INTERLACED);