diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-03-17 17:17:12 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-03-17 17:17:12 -0200 |
| commit | 13f01356dce8354c14e7e1a3f25162a24a002fff (patch) | |
| tree | be56b6e00cb9f43ede9aae91d005f8f4e1f8ed02 /linux/drivers/media/video/ivtv/ivtv-yuv.c | |
| parent | c2bf3c10a14ccac828d6ce7c3dbc43aeb12bcc9b (diff) | |
| parent | edc9f8560fa088ed74644de3a089b6e8beef0e26 (diff) | |
| download | mediapointer-dvb-s2-13f01356dce8354c14e7e1a3f25162a24a002fff.tar.gz mediapointer-dvb-s2-13f01356dce8354c14e7e1a3f25162a24a002fff.tar.bz2 | |
merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-yuv.c')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-yuv.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-yuv.c b/linux/drivers/media/video/ivtv/ivtv-yuv.c index 286a0d7e7..bcea09542 100644 --- a/linux/drivers/media/video/ivtv/ivtv-yuv.c +++ b/linux/drivers/media/video/ivtv/ivtv-yuv.c @@ -613,16 +613,19 @@ static void ivtv_yuv_handle_vertical(struct ivtv *itv, struct yuv_frame_info *wi } itv->yuv_info.frame_interlaced_last = itv->yuv_info.frame_interlaced; - itv->yuv_info.lace_threshold_last = itv->yuv_info.lace_threshold; } /* Modify the supplied coordinate information to fit the visible osd area */ static u32 ivtv_yuv_window_setup (struct ivtv *itv, struct yuv_frame_info *window) { - int osd_crop; + int osd_crop, lace_threshold; u32 osd_scale; u32 yuv_update = 0; + lace_threshold = itv->yuv_info.lace_threshold; + if (lace_threshold < 0) + lace_threshold = itv->yuv_info.decode_height - 1; + /* Work out the lace settings */ switch (itv->yuv_info.lace_mode) { case IVTV_YUV_MODE_PROGRESSIVE: /* Progressive mode */ @@ -639,7 +642,7 @@ static u32 ivtv_yuv_window_setup (struct ivtv *itv, struct yuv_frame_info *windo break; case IVTV_YUV_MODE_AUTO: - if (window->tru_h <= itv->yuv_info.lace_threshold || window->tru_h > 576 || window->tru_w > 720){ + if (window->tru_h <= lace_threshold || window->tru_h > 576 || window->tru_w > 720){ itv->yuv_info.frame_interlaced = 0; if ((window->tru_h < 512) || (window->tru_h > 576 && window->tru_h < 1021) || |