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

[Felix Buenemann]

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

Modified Files:
	vo_ggi.c 
Log Message:
Fixed OSD.


Index: vo_ggi.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_ggi.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** vo_ggi.c	2001/06/17 16:12:47	1.4
--- vo_ggi.c	2001/06/17 17:43:04	1.5
***************
*** 28,35 ****
  #define GGI_OSD
  
- #ifdef GGI_OSD
- #warning "GGI_OSD is bugging!"
- #endif
- 
  LIBVO_EXTERN (ggi)
  
--- 28,31 ----
***************
*** 294,298 ****
      unsigned char *srca, int stride)
  {
- #warning "draw_alpha needs to be fixed!"
      switch(ggi_format)
      {
--- 290,293 ----
***************
*** 301,341 ****
  	case IMGFMT_IYUV:
  	    vo_draw_alpha_yv12(w, h, src, srca, stride,
! 		((uint8_t *) ggi_buffer->write)+(virt_width*y0+x0)*ggi_bppmul,
! 		virt_width*ggi_bppmul);
  	    break;
  	case IMGFMT_YUY2:
  	case IMGFMT_YVYU:
  	    vo_draw_alpha_yuy2(w, h, src, srca, stride,
! 		((uint8_t *) ggi_buffer->write)+2*(virt_width*y0+x0)*ggi_bppmul,
! 		2*virt_width*ggi_bppmul);
  	    break;
  	case IMGFMT_UYVY:
  	    vo_draw_alpha_yuy2(w, h, src, srca, stride,
! 		((uint8_t *) ggi_buffer->write)+2*(virt_width*y0+x0)*ggi_bppmul+1,
! 		2*virt_width*ggi_bppmul);
  	    break;
  	case IMGFMT_RGB15:
          case IMGFMT_BGR15:
              vo_draw_alpha_rgb15(w, h, src, srca, stride, 
! 		((uint8_t *) ggi_buffer->write)+2*(virt_width*y0+x0)*ggi_bppmul,
! 		2*virt_width*ggi_bppmul);
              break;
          case IMGFMT_RGB16:
          case IMGFMT_BGR16:
              vo_draw_alpha_rgb16(w, h, src, srca, stride, 
! 		((uint8_t *) ggi_buffer->write)+2*(virt_width*y0+x0)*ggi_bppmul,
! 		2*virt_width*ggi_bppmul);
              break;
          case IMGFMT_RGB24:
          case IMGFMT_BGR24:
              vo_draw_alpha_rgb24(w, h, src, srca, stride, 
! 		((uint8_t *) ggi_buffer->write)+3*(virt_width*y0+x0)*ggi_bppmul,
! 		3*virt_width*ggi_bppmul);
              break;
          case IMGFMT_RGB32:
          case IMGFMT_BGR32:
              vo_draw_alpha_rgb32(w, h, src, srca, stride, 
! 		((uint8_t *) ggi_buffer->write)+4*(virt_width*y0+x0)*ggi_bppmul,
! 		4*virt_width*ggi_bppmul);
  	    break;
      }
--- 296,336 ----
  	case IMGFMT_IYUV:
  	    vo_draw_alpha_yv12(w, h, src, srca, stride,
! 		ggi_buffer->write+(virt_width*y0+x0),
! 		virt_width);
  	    break;
  	case IMGFMT_YUY2:
  	case IMGFMT_YVYU:
  	    vo_draw_alpha_yuy2(w, h, src, srca, stride,
! 		ggi_buffer->write+2*(virt_width*y0+x0),
! 		2*virt_width);
  	    break;
  	case IMGFMT_UYVY:
  	    vo_draw_alpha_yuy2(w, h, src, srca, stride,
! 		ggi_buffer->write+2*(virt_width*y0+x0)+1,
! 		2*virt_width);
  	    break;
  	case IMGFMT_RGB15:
          case IMGFMT_BGR15:
              vo_draw_alpha_rgb15(w, h, src, srca, stride, 
! 		ggi_buffer->write+2*(virt_width*y0+x0),
! 		2*virt_width);
              break;
          case IMGFMT_RGB16:
          case IMGFMT_BGR16:
              vo_draw_alpha_rgb16(w, h, src, srca, stride, 
! 		ggi_buffer->write+2*(virt_width*y0+x0),
! 		2*virt_width);
              break;
          case IMGFMT_RGB24:
          case IMGFMT_BGR24:
              vo_draw_alpha_rgb24(w, h, src, srca, stride, 
! 		ggi_buffer->write+3*(virt_width*y0+x0),
! 		3*virt_width);
              break;
          case IMGFMT_RGB32:
          case IMGFMT_BGR32:
              vo_draw_alpha_rgb32(w, h, src, srca, stride, 
! 		ggi_buffer->write+4*(virt_width*y0+x0),
! 		4*virt_width);
  	    break;
      }


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