Mercurial > mplayer.hg

changeset 9947:b552e7939ca2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
adding geometry support for xvidix fixing some 10l in geometry.c
author attila
date Sun, 20 Apr 2003 15:09:19 +0000
parents 7a51e10ceef4
children ad081e771ada
files libvo/geometry.c libvo/vo_xvidix.c
diffstat 2 files changed, 13 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/geometry.c	Sun Apr 20 14:40:38 2003 +0000
+++ b/libvo/geometry.c	Sun Apr 20 15:09:19 2003 +0000
@@ -60,17 +60,23 @@
 	       }
 
 		mp_msg(MSGT_VO, MSGL_V,"geometry set to width: %i,"
-		  "height: %i, xoff: %i, yoff: %i, xper: %1, yper: %i\n",
+		  "height: %i, xoff: %i, yoff: %i, xper: %i, yper: %i\n",
 		  width, height, xoff, yoff, xper, yper);
 		  
 		if(xper >= 0 && xper <= 100) xoff = (scrw - *widw) * ((float)xper / 100.0);
 		if(yper >= 0 && yper <= 100) yoff = (scrh - *widh) * ((float)yper / 100.0);
 
+		mp_msg(MSGT_VO, MSGL_V,"geometry set to width: %i,"
+		  "height: %i, xoff: %i, yoff: %i, xper: %i, yper: %i\n",
+		  width, height, xoff, yoff, xper, yper);
+		mp_msg(MSGT_VO, MSGL_V,"geometry window parameter: widw: %i,"
+		  " widh: %i, scrw: %i, scrh: %i\n",*widw, *widh, scrw, scrh);
+		  
 		/* FIXME: better checking of bounds... */
-		if(width < 0 || width > scrw) width = *widw;
-		if(height < 0 || height > scrh) height = *widh;
-		if(xoff < 0 || xoff + *widw > scrw) xoff = 0;
-		if(yoff < 0 || yoff + *widh > scrh) yoff = 0;
+		if(width < 0 || width > scrw) width = (scrw < *widw) ? scrw : *widw;
+		if(height < 0 || height > scrh) height = (scrh < *widh) ? scrh : *widh;
+		if(xoff < 0 || xoff + width > scrw) xoff = 0;
+		if(yoff < 0 || yoff + height > scrh) yoff = 0;
 
 		if(xpos) *xpos = xoff;
 		if(ypos) *ypos = yoff;
--- a/libvo/vo_xvidix.c	Sun Apr 20 14:40:38 2003 +0000
+++ b/libvo/vo_xvidix.c	Sun Apr 20 15:09:19 2003 +0000
@@ -238,6 +238,8 @@
 
     vo_dx = 0;
     vo_dy = 0;
+    vo_dx=( vo_screenwidth - d_width ) / 2; vo_dy=( vo_screenheight - d_height ) / 2;    
+    geometry(&vo_dx, &vo_dy, &d_width, &d_height, vo_screenwidth, vo_screenheight);
     window_width = d_width;
     window_height = d_height;
 
@@ -266,7 +268,6 @@
 
     aspect(&d_width, &d_height, A_NOZOOM);
 
-    vo_dx=( vo_screenwidth - d_width ) / 2; vo_dy=( vo_screenheight - d_height ) / 2;    
     vo_dwidth=d_width; vo_dheight=d_height;
 
 #ifdef HAVE_NEW_GUI