Mercurial > mplayer.hg

changeset 9237:a076d22664b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
disable auto oldmethod, directrendering for linear modes only
author iive
date Mon, 03 Feb 2003 01:15:45 +0000
parents 1c1dfa94caa9
children 0a3e0a7d0b9d
files libvo/vo_svga.c
diffstat 1 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_svga.c	Mon Feb 03 01:08:47 2003 +0000
+++ b/libvo/vo_svga.c	Mon Feb 03 01:15:45 2003 +0000
@@ -457,9 +457,6 @@
     return(1); // error
   }
   
-  if(vid_mode<10 || vid_mode==145) {
-  	oldmethod=1;
-  }
   /* set 332 palette for 8 bpp */
   if(bpp==8){
     int i;
@@ -478,9 +475,12 @@
   BYTESPERPIXEL=(bpp+4)>>3;
     LINEWIDTH=vga_getmodeinfo(vid_mode)->linewidth;
 
-  if(oldmethod && (bpp==8 || bpp==4)) LINEWIDTH*=8;
+  if( (vid_mode<10 || vid_mode==145) && (bpp==8 || bpp==4)) LINEWIDTH*=8;
+  else
+    if(vga_getmodeinfo(vid_mode)->flags & CAPABLE_LINEAR)
+//  	  if (vga_version>0x1430)//remove this to get more speed (or black screen)
+		vga_setlinearaddressing();
   
-  if(!oldmethod || (bpp>8))vga_setlinearaddressing();
   if(oldmethod) {
      buffer=malloc(HEIGHT*LINEWIDTH);
      maxframes=0;
@@ -850,7 +850,8 @@
 	(mpi->height != image_height) */
     )
 	return(VO_FALSE);
-
+	if(!directrender)
+	  return (VO_FALSE);
 /*
     if (Flip_Flag)
     {