[MPlayer-cvslog] r29051 - trunk/libvo/vo_vdpau.c

[cehoyos]

Author: cehoyos
Date: Tue Mar 24 22:45:39 2009
New Revision: 29051

Log:
Stephen Warren reported that VDPAU deinterlacing did not work correctly.
New static function push_deint_surface() by Reimar.

Modified:
   trunk/libvo/vo_vdpau.c

Modified: trunk/libvo/vo_vdpau.c
==============================================================================
--- trunk/libvo/vo_vdpau.c	Tue Mar 24 20:48:51 2009	(r29050)
+++ trunk/libvo/vo_vdpau.c	Tue Mar 24 22:45:39 2009	(r29051)
@@ -212,6 +212,13 @@ static int                              
 
 static void draw_eosd(void);
 
+static void push_deint_surface(VdpVideoSurface surface)
+{
+    deint_surfaces[2] = deint_surfaces[1];
+    deint_surfaces[1] = deint_surfaces[0];
+    deint_surfaces[0] = surface;
+}
+
 static void video_to_output_surface(void)
 {
     VdpTime dummy;
@@ -227,9 +234,10 @@ static void video_to_output_surface(void
             draw_eosd();
             draw_osd();
             flip_page();
+            push_deint_surface(surface_render[vid_surface_num].surface);
         }
         if (deint)
-            field = top_field_first == i ?
+            field = (top_field_first == i) ^ (deint > 2) ?
                     VDP_VIDEO_MIXER_PICTURE_STRUCTURE_BOTTOM_FIELD:
                     VDP_VIDEO_MIXER_PICTURE_STRUCTURE_TOP_FIELD;
         output_surface = output_surfaces[surface_num];
@@ -887,9 +895,7 @@ static uint32_t draw_image(mp_image_t *m
     if (deint < 3)
         deint_surfaces[0] = surface_render[vid_surface_num].surface;
     video_to_output_surface();
-    deint_surfaces[2] = deint_surfaces[1];
-    deint_surfaces[1] = deint_surfaces[0];
-    deint_surfaces[0] = surface_render[vid_surface_num].surface;
+    push_deint_surface(surface_render[vid_surface_num].surface);
     return VO_TRUE;
 }