From 3b5c1c8e71eb8fe2297a5884db59108e3c8b44c5 Mon Sep 17 00:00:00 2001 From: Ian Armstrong Date: Mon, 22 Oct 2007 14:24:26 -0300 Subject: V4L/DVB (6716): ivtv: yuv interlace mode change Interlace mode selection code moved into the frame setup phase, so it's now run before the frame is loaded into a hardware buffer. Given that it can affect how a new frame is displayed, it was a bit stupid running it after the frame was already visible. A few stray interlace related variables which were linked to individual frames have now been moved into the yuv_frame_info struct. This means that all variables linked to a specific frame are in the same place & not scattered. Minor code reformatting in areas touched by the above changes. Signed-off-by: Ian Armstrong Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- drivers/media/video/ivtv/ivtv-driver.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'drivers/media/video/ivtv/ivtv-driver.h') diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h index 12ff9382718d..0e4ad29821e0 100644 --- a/drivers/media/video/ivtv/ivtv-driver.h +++ b/drivers/media/video/ivtv/ivtv-driver.h @@ -392,6 +392,9 @@ struct yuv_frame_info u32 tru_h; u32 offset_y; s32 lace_mode; + u32 sync_field; + u32 delay; + u32 interlaced; }; #define IVTV_YUV_MODE_INTERLACED 0x00 @@ -465,8 +468,6 @@ struct yuv_playback_info int decode_height; - int frame_interlaced; - int lace_mode; int lace_threshold; int lace_sync_field; @@ -477,8 +478,6 @@ struct yuv_playback_info u32 yuv_forced_update; int update_frame; - int sync_field[IVTV_YUV_BUFFERS]; /* Field to sync on */ - int field_delay[IVTV_YUV_BUFFERS]; /* Flag to extend duration of previous frame */ u8 fields_lapsed; /* Counter used when delaying a frame */ struct yuv_frame_info new_frame_info[IVTV_YUV_BUFFERS]; -- cgit v1.2.3