[Mplayer-cvslog] CVS: main/libvo vo_svga.c,1.30,1.31

[Zoltan Mark Vician]

Update of /cvsroot/mplayer/main/libvo
In directory usw-pr-cvs1:/tmp/cvs-serv9009/libvo

Modified Files:
	vo_svga.c 
Log Message:
Scaling bug fixed.

Index: vo_svga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** vo_svga.c	2001/05/25 15:45:35	1.30
--- vo_svga.c	2001/06/03 23:10:37	1.31
***************
*** 131,135 ****
    uint32_t req_h = (d_height > 0 ? d_height : height);
    uint16_t vid_mode = 0;
!   uint8_t widescreen = (((req_w*1.0)/req_h) > (4.0/3)) ? 1 : 0;
    uint16_t buf_w = USHRT_MAX, buf_h = USHRT_MAX;
    vga_modelist_t *list = modelist;
--- 131,135 ----
    uint32_t req_h = (d_height > 0 ? d_height : height);
    uint16_t vid_mode = 0;
!   uint8_t res_widescr, vid_widescr = (((req_w*1.0)/req_h) > (4.0/3)) ? 1 : 0;
    uint16_t buf_w = USHRT_MAX, buf_h = USHRT_MAX;
    vga_modelist_t *list = modelist;
***************
*** 257,260 ****
--- 257,261 ----
                       buf_w = list->modeinfo.width;
                       buf_h = list->modeinfo.height;
+ 		     res_widescr = (((buf_w*1.0)/buf_h) > (4.0/3)) ? 1 : 0;
  		   }
  		 break;
***************
*** 264,267 ****
--- 265,269 ----
                       buf_w = list->modeinfo.width;
                       buf_h = list->modeinfo.height;
+ 		     res_widescr = (((buf_w*1.0)/buf_h) > (4.0/3)) ? 1 : 0;
  		   }
  		 break;
***************
*** 271,274 ****
--- 273,277 ----
                       buf_w = list->modeinfo.width;
                       buf_h = list->modeinfo.height;
+ 		     res_widescr = (((buf_w*1.0)/buf_h) > (4.0/3)) ? 1 : 0;
  		   }
  		 break;
***************
*** 278,281 ****
--- 281,285 ----
                       buf_w = list->modeinfo.width;
                       buf_h = list->modeinfo.height;
+ 		     res_widescr = (((buf_w*1.0)/buf_h) > (4.0/3)) ? 1 : 0;
  		   }
  		 break;
***************
*** 321,326 ****
    orig_w = width;
    orig_h = height;
!   if ((fullscreen & 0x04) && (WIDTH != orig_w)) {
!     if (!widescreen) {
        maxh = HEIGHT;
        scaling = maxh / (orig_h * 1.0);
--- 325,330 ----
    orig_w = width;
    orig_h = height;
!   if ((fullscreen & 0x04) && (WIDTH != orig_w) && (HEIGHT != orig_h)) {
!     if (!vid_widescr || !res_widescr) {
        maxh = HEIGHT;
        scaling = maxh / (orig_h * 1.0);
***************
*** 493,499 ****
    
    yuv2rgb(yuvbuf, image[0], image[1], image[2], w, h, orig_w * BYTESPERPIXEL, stride[0], stride[1]);
- //#ifdef HAVE_MMX
- //  emms();
- //#endif
    sw = (uint32_t) (w * scaling);
    sh = (uint32_t) (h * scaling);
--- 497,500 ----


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog