[Mplayer-cvslog] CVS: main/libvo vo_dga.c,1.17,1.18

[Andreas Ackermann]

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

Modified Files:
	vo_dga.c 
Log Message:
- now mpeg is fast again (no more offscreen buffer rubbish) But is it really ok? 


Index: vo_dga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** vo_dga.c	2001/04/24 11:42:04	1.17
--- vo_dga.c	2001/05/01 20:24:31	1.18
***************
*** 24,27 ****
--- 24,30 ----
   *
   * $Log$
+  * Revision 1.18  2001/05/01 20:24:31  acki2
+  * - now mpeg is fast again (no more offscreen buffer rubbish) But is it really ok?
+  *
   * Revision 1.17  2001/04/24 11:42:04  pontscho
   * clean up
***************
*** 260,264 ****
  
  static unsigned char     *vo_dga_base;
- static unsigned char     *vo_dga_yv12_base = NULL;
  static Display  *vo_dga_dpy;
  
--- 263,266 ----
***************
*** 371,378 ****
  static void flip_page( void ){
  
-   if(vo_dga_src_format ==IMGFMT_YV12 ){
-        draw_frame( &vo_dga_yv12_base);
-   }
- 
    vo_draw_text(vo_dga_src_width,vo_dga_src_height,draw_alpha);
    
--- 373,376 ----
***************
*** 398,413 ****
  {
  
!   // for osd, we need a separate buffer here ... :-()
! 
!     yuv2rgb( vo_dga_yv12_base + (vo_dga_src_width * y +x) * BYTESPP,
!          src[0], src[1], src[2],
!          w,h, vo_dga_src_width * BYTESPP,
!          stride[0],stride[1] );
! 
!   //  yuv2rgb( vo_dga_base + vo_dga_vp_offset + 
!   //        (vo_dga_width * y +x) * BYTESPP,
!   //         src[0], src[1], src[2],
!   //         w,h, vo_dga_width * BYTESPP,
!   //         stride[0],stride[1] );
    return 0;
  };
--- 396,404 ----
  {
  
!   yuv2rgb( vo_dga_base + vo_dga_dbf_current * vo_dga_dbf_mem_offset + vo_dga_vp_offset + 
!           (vo_dga_width * y +x) * BYTESPP,
!            src[0], src[1], src[2],
!            w,h, vo_dga_width * BYTESPP,
!            stride[0],stride[1] );
    return 0;
  };
***************
*** 519,524 ****
  
    if(vo_dga_is_running){	
-     if(vo_dga_yv12_base)free(vo_dga_yv12_base);
-     vo_dga_yv12_base = NULL;
      vo_dga_is_running = 0;
      vd_printf( VD_DBG, "vo_dga: in uninit\n");
--- 510,513 ----
***************
*** 679,691 ****
    } 
  
-   if(format ==IMGFMT_YV12 ){
-     vo_dga_yv12_base = malloc(wanted_width * wanted_height * BYTESPP);
-     if(vo_dga_yv12_base== NULL){
-       vd_printf(VD_ERR, "vo_dga: Not enough memory for offscreen YV12 buffer!\n");
-       return 1;
-     }
-   }
- 
- 
    vo_dga_vp_width = DisplayWidth( vo_dga_dpy, DefaultScreen(vo_dga_dpy));
    vo_dga_vp_height = DisplayHeight( vo_dga_dpy, DefaultScreen(vo_dga_dpy));
--- 668,671 ----
***************
*** 811,818 ****
  #endif
  #endif
-      if(vo_dga_yv12_base){
-        free(vo_dga_yv12_base);
-        vo_dga_yv12_base = NULL;
-      }
       return 1;
    }
--- 791,794 ----


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