CVS: main/libvo vo_svga.c,1.20,1.21

18 Apr 2001


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

Modified Files:
	vo_svga.c 
Log Message:
Some debug information (using verbose) added.

Index: vo_svga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** vo_svga.c	2001/04/18 10:37:09	1.20
--- vo_svga.c	2001/04/18 18:14:11	1.21
***************
*** 24,27 ****
--- 24,28 ----
  extern void rgb15to16_mmx(char* s0,char* d0,int count);
  extern int vo_dbpp;
+ extern int verbose;
  
  LIBVO_EXTERN(svga)
***************
*** 114,117 ****
--- 115,120 ----
          case 4: bpp_avail |= BPP_32; break;
        }
+       if (verbose >= 2)
+         printf("vo_svga: Mode found: %s\n",vga_getmodename(i));
        if (add_mode(i, *minfo))
          return(1);
***************
*** 138,142 ****
    while (list != NULL) {
      if ((list->modeinfo.width >= req_w) && (list->modeinfo.height >= req_h)) {
- //	printf("w: %d, h: %d, bpp: %d, colors: %d\n",list->modeinfo.width,list->modeinfo.height,list->modeinfo.bytesperpixel,list->modeinfo.colors);
        switch (list->modeinfo.colors) {
          case 32768: bpp_avail |= BPP_15; break;
--- 141,144 ----
***************
*** 158,162 ****
      if (format == IMGFMT_YV12) bpp = 32;
      else bpp = format & 255;
! //    printf("bpp: %d\n",bpp);
      switch (bpp) {
        case 32: if (!(bpp_avail & BPP_32)) {
--- 160,165 ----
      if (format == IMGFMT_YV12) bpp = 32;
      else bpp = format & 255;
!     if (verbose)
!       printf("vo_svga: vo_dbpp == 0, bpp: %d\n",bpp);
      switch (bpp) {
        case 32: if (!(bpp_avail & BPP_32)) {
***************
*** 174,177 ****
--- 177,182 ----
  		     bpp = 32;
  		     bpp_conv = 1;
+ 		     if (verbose)
+ 		       printf("vo_svga: BPP conversion 24->32\n");
  		   }     
                 break;
***************
*** 190,193 ****
--- 195,200 ----
  		     bpp = 16;
  		     bpp_conv = 1;
+ 		     if (verbose)
+ 		       printf("vo_svga: BPP conversion 15->16\n");
  		   }
                 break;
***************
*** 195,198 ****
--- 202,207 ----
    } else {
        bpp = vo_dbpp;
+       if (verbose)
+         printf("vo_svga: vo_dbpp == %d\n",bpp);
        switch (bpp) {
          case 32: if (!(bpp_avail & BPP_32)) {
***************
*** 220,227 ****
  
    list = modelist;
! //  printf("req_w: %d, req_h: %d\n",req_w,req_h);
    while (list != NULL) {
      if ((list->modeinfo.width >= req_w) && (list->modeinfo.height >= req_h)) {
! //      printf("w: %d, h: %d, bpp: %d, colors: %d, req_bpp: %d\n",list->modeinfo.width,list->modeinfo.height,list->modeinfo.bytesperpixel,list->modeinfo.colors,bpp);
        switch (bpp) {
          case 32: if (list->modeinfo.bytesperpixel == 4)
--- 229,252 ----
  
    list = modelist;
!   if (verbose) {
!     printf("vo_svga: Looking for the best resolution...\n");
!     printf("vo_svga: req_w: %d, req_h: %d, bpp: %d\n",req_w,req_h,bpp);
!   }
    while (list != NULL) {
      if ((list->modeinfo.width >= req_w) && (list->modeinfo.height >= req_h)) {
!       if (verbose) {
!         switch (list->modeinfo.colors) {
!           case 32768: printf("vo_svga: vid_mode: %d, %dx%d 15bpp\n",list->modenum,list->modeinfo.width,list->modeinfo.height);
! 	              break;
!           case 65536: printf("vo_svga: vid_mode: %d, %dx%d 16bpp\n",list->modenum,list->modeinfo.width,list->modeinfo.height);
! 	              break;
!         }
!         switch (list->modeinfo.bytesperpixel) {
!           case 3: printf("vo_svga: vid_mode: %d, %dx%d 24bpp\n",list->modenum,list->modeinfo.width,list->modeinfo.height);
! 	          break;
!           case 4: printf("vo_svga: vid_mode: %d, %dx%d 32bpp\n",list->modenum,list->modeinfo.width,list->modeinfo.height);
! 	          break;
!         }
!       }
        switch (bpp) {
          case 32: if (list->modeinfo.bytesperpixel == 4)
***************
*** 258,262 ****
    }
  
! //  printf("vid_mode: %d\n",vid_mode);
    vga_setlinearaddressing();
    if (vga_setmode(vid_mode) == -1) {
--- 283,288 ----
    }
  
!   if (verbose)
!     printf("vo_svga: vid_mode: %d\n",vid_mode);
    vga_setlinearaddressing();
    if (vga_setmode(vid_mode) == -1) {
***************
*** 332,337 ****
    }
  
! //  printf("bpp_conv: %d\n",bpp_conv);
!   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");
--- 358,362 ----
    }
  
!   printf("vo_svga: 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");


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

Zoltan Mark Vician

tags

participants (1)