[Mplayer-cvslog] CVS: main/libvo vo_dfbmga.c,1.5,1.6

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv23498

Modified Files:
	vo_dfbmga.c 
Log Message:
This patch fixes the OSD flickering problem with vo_dfbmga.
Ville Syrjälä <syrjala at sci.fi>


Index: vo_dfbmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dfbmga.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vo_dfbmga.c	11 Nov 2002 15:20:25 -0000	1.5
+++ vo_dfbmga.c	16 Nov 2002 03:02:23 -0000	1.6
@@ -105,6 +105,8 @@
 static int use_spic  = 1;
 
 static int osd_changed;
+static int osd_dirty;
+static int osd_current;
 
 /******************************
 *	    vo_directfb       *
@@ -436,6 +438,9 @@
      if (use_spic)
           spic->SetOpacity( spic, 0xFF );
 
+     osd_dirty = 0;
+     osd_current = 1;
+
      return 0;
 }
 
@@ -497,8 +502,17 @@
      void *dst;
      int pitch;
 
-     if (use_spic && !osd_changed)
-          return;
+     if (use_spic) {
+          if (!osd_changed)
+               return;
+          osd_dirty |= osd_current;
+     } else if (use_crtc2) {
+          if (x0 < drect.x ||
+              y0 < drect.y ||
+              x0 + w > drect.x + drect.w ||
+              y0 + h > drect.y + drect.h)
+               osd_dirty |= osd_current;
+     }
 
      if (subframe->Lock( subframe, DSLF_WRITE, &dst, &pitch ) != DFB_OK)
           return;
@@ -608,7 +622,7 @@
 
      osd_changed = vo_osd_changed( 0 );
 
-     if (osd_changed) {
+     if (osd_dirty & osd_current) {
           if (use_spic) {
                subframe->Clear( subframe, 0, 0, 0, 0 );
           } else if (use_crtc2) {
@@ -627,6 +641,7 @@
                                         drect.x + drect.w, drect.y,
                                         drect.x, drect.h );
           }
+          osd_dirty &= ~osd_current;
      }
 
      if (use_crtc2) {
@@ -644,8 +659,10 @@
 
      vo_draw_text( sub_width, sub_height, draw_alpha );
 
-     if (use_spic)
+     if (use_spic && osd_changed) {
           subframe->Flip( subframe, NULL, 0 );
+          osd_current ^= 3;
+     }
 }
 
 static void
@@ -657,6 +674,8 @@
      } else {
           /* Flip CRTC2 */
           c2frame->Flip( c2frame, NULL, vo_vsync ? DSFLIP_WAITFORSYNC : 0 );
+          if (!use_spic)
+               osd_current ^= 3;
      }
 
      current_buf = 0;