[Mplayer-cvslog] CVS: main/libvo vo_svga.c,1.4,1.5

[Zoltan Mark Vician]

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

Modified Files:
	vo_svga.c 
Log Message:

Some bugfix.


Index: vo_svga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** vo_svga.c	2001/04/05 20:42:24	1.4
--- vo_svga.c	2001/04/06 10:25:47	1.5
***************
*** 1,4 ****
  /*
!   Video driver for SVGAlib - alpha version
    by Zoltan Mark Vician <se7en at sch.bme.hu>
    Code started: Mon Apr  1 23:25:47 2000
--- 1,4 ----
  /*
!   Video driver for SVGAlib - alpha, slow
    by Zoltan Mark Vician <se7en at sch.bme.hu>
    Code started: Mon Apr  1 23:25:47 2000
***************
*** 76,85 ****
                       uint32_t d_height, uint32_t fullscreen, char *title, 
  		     uint32_t format) {
! static uint8_t bpp;
    if (!checked) {
      checksupportedmodes(); // Looking for available video modes
    }
    pformat = format;
!   if(format==IMGFMT_YV12) bpp=32; else bpp=format&255;
    if (d_width > 800)
      switch (bpp) {
--- 76,87 ----
                       uint32_t d_height, uint32_t fullscreen, char *title, 
  		     uint32_t format) {
!   static uint8_t bpp;
!   
    if (!checked) {
      checksupportedmodes(); // Looking for available video modes
    }
    pformat = format;
!   if (format == IMGFMT_YV12) bpp = 32; 
!   else bpp = format & 255;
    if (d_width > 800)
      switch (bpp) {
***************
*** 126,133 ****
    orig_h = height;
    if (fullscreen && (WIDTH != orig_w)) {
!     maxw = WIDTH;
!     scaling = maxw / (orig_w*1.0);
!     maxh = (uint32_t) (orig_h * scaling);
!     scalebuf = malloc(maxw * maxh * BYTESPERPIXEL);
    } else {
        maxw = orig_w;
--- 128,142 ----
    orig_h = height;
    if (fullscreen && (WIDTH != orig_w)) {
!     if (((orig_w*1.0) / orig_h) < (4.0/3)) {
!       maxh = HEIGHT;
!       scaling = maxh / (orig_h * 1.0);
!       maxw = (uint32_t) (orig_w * scaling);
!       scalebuf = malloc(maxw * maxh * BYTESPERPIXEL);
!     } else {
!         maxw = WIDTH;
!         scaling = maxw / (orig_w * 1.0);
!         maxh = (uint32_t) (orig_h * scaling);
!         scalebuf = malloc(maxw * maxh * BYTESPERPIXEL);
!       }
    } else {
        maxw = orig_w;
***************
*** 143,148 ****
    }
    
!   printf("SVGAlib resolution: %dx%d %dbpp - ",WIDTH,HEIGHT,bpp);
!   if (maxw != orig_w || maxh != orig_h) printf("Video scaled to: %dx%d\n",maxw,maxh);
    else printf("No video scaling\n");
  
--- 152,157 ----
    }
    
!   printf("SVGAlib resolution: %dx%d %dbpp - ", WIDTH, HEIGHT, bpp);
!   if (maxw != orig_w || maxh != orig_h) printf("Video scaled to: %dx%d %f.2\n",maxw,maxh,scaling);
    else printf("No video scaling\n");
  
***************
*** 226,231 ****
  
  static void flip_page(void) {
!   gl_fillbox(0, 0, WIDTH, y_pos, 0);
!   gl_fillbox(0, HEIGHT - y_pos, WIDTH, y_pos, 0);
    vo_draw_text(WIDTH, HEIGHT, draw_alpha);
    gl_copyscreen(screen);
--- 235,245 ----
  
  static void flip_page(void) {
!   if (y_pos) {
!     gl_fillbox(0, 0, WIDTH, y_pos, 0);
!     gl_fillbox(0, HEIGHT - y_pos, WIDTH, y_pos, 0);
!   } else {
!       gl_fillbox(0, 0, x_pos, HEIGHT, 0);
!       gl_fillbox(WIDTH - x_pos, 0, x_pos, HEIGHT, 0);
!     } 
    vo_draw_text(WIDTH, HEIGHT, draw_alpha);
    gl_copyscreen(screen);


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