[MPlayer-cvslog] r28006 - trunk/libvo/vo_x11.c

[reimar]

Author: reimar
Date: Sun Nov 23 21:17:46 2008
New Revision: 28006

Log:
Use aspect.c code in vo_x11.c. Removes some inconsistencies in -wid handling.


Modified:
   trunk/libvo/vo_x11.c

Modified: trunk/libvo/vo_x11.c
==============================================================================
--- trunk/libvo/vo_x11.c	(original)
+++ trunk/libvo/vo_x11.c	Sun Nov 23 21:17:46 2008
@@ -6,6 +6,7 @@
 #include "config.h"
 #include "video_out.h"
 #include "video_out_internal.h"
+#include "aspect.h"
 
 
 #include <X11/Xlib.h>
@@ -83,7 +84,6 @@ static uint32_t out_format = 0;
 static int out_offset;
 static int srcW = -1;
 static int srcH = -1;
-static int aspect;              // 1<<16 based fixed point aspect, so that the aspect stays correct during resizing
 
 static int old_vo_dwidth = -1;
 static int old_vo_dheight = -1;
@@ -354,8 +354,6 @@ static int config(uint32_t width, uint32
     image_width = (width + 7) & (~7);
     image_height = height;
 
-    aspect = ((1 << 16) * d_width + d_height / 2) / d_height;
-
 #ifdef CONFIG_GUI
     if (use_gui)
         guiGetEvent(guiSetShVideo, 0);  // the GUI will set up / resize the window
@@ -524,17 +522,13 @@ static int draw_slice(uint8_t * src[], i
     {
         int newW = vo_dwidth;
         int newH = vo_dheight;
-        int newAspect = (newW * (1 << 16) + (newH >> 1)) / newH;
         struct SwsContext *oldContext = swsContext;
 
-        if (newAspect > aspect)
-            newW = (newH * aspect + (1 << 15)) >> 16;
-        else
-            newH = ((newW << 16) + (aspect >> 1)) / aspect;
-
         old_vo_dwidth = vo_dwidth;
         old_vo_dheight = vo_dheight;
 
+        if (vo_fs)
+            aspect(&newW, &newH, A_ZOOM);
         if (sws_flags == 0)
             newW &= (~31);      // not needed but, if the user wants the FAST_BILINEAR SCALER, then its needed