[Mplayer-cvslog] CVS: main/libvo vosub_vidix.c,1.12,1.13 vosub_vidix.h,1.4,1.5

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv25789

Modified Files:
	vosub_vidix.c vosub_vidix.h 
Log Message:
added colorkey handling

Index: vosub_vidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vosub_vidix.c	18 Jan 2002 10:41:31 -0000	1.12
+++ vosub_vidix.c	18 Jan 2002 18:14:44 -0000	1.13
@@ -45,8 +45,6 @@
 #define SCREEN_LINE_SIZE(pixel_size) (video_mode_info.XResolution*(pixel_size) )
 #define IMAGE_LINE_SIZE(pixel_size) (image_width*(pixel_size))
 
-extern vo_functions_t video_out_vesa;
-
 int vidix_preinit(const char *drvname,void *server)
 {
   int err;
@@ -147,6 +145,8 @@
 	}
 
 	next_frame = 0;
+	if(vo_doublebuffering)
+	    vdlPlaybackFrameSelect(vidix_handler,next_frame);
 	vidix_mem =vidix_play.dga_addr;
 
 	/*clear the buffer*/
@@ -162,7 +162,7 @@
 extern int vo_gamma_green_intense;
 extern int vo_gamma_blue_intense;
 
-vidix_video_eq_t vid_eq;
+static vidix_video_eq_t vid_eq;
 
 int vidix_start(void)
 {
@@ -216,7 +216,6 @@
 void vidix_term( void )
 {
   if(verbose > 1) printf("vosub_vidix: vidix_term() was called\n");
-//	vdlPlaybackOff(vidix_handler);
 	vidix_stop();
 	vdlClose(vidix_handler);
 }
@@ -279,6 +278,8 @@
         src+=stride[0];
         dest += bespitch;
     }
+
+    return 0;
 }
 
 
@@ -298,7 +299,7 @@
 /* Note it's very strange but sometime for YUY2 draw_frame is called */
     if(src_format == IMGFMT_YV12 || src_format == IMGFMT_I420 || src_format == IMGFMT_IYUV)
     {
-	printf("vosub_vidix: draw_frame for i420 is called\nExiting...\n");
+	printf("vosub_vidix: draw_frame for YUV420 called\nExiting...\n");
 	vidix_term();
 	exit( EXIT_FAILURE );
     }
@@ -370,4 +371,14 @@
   vidix_fourcc.fourcc = format;
   vdlQueryFourcc(vidix_handler,&vidix_fourcc);
   return vidix_fourcc.depth != VID_DEPTH_NONE;
+}
+
+int vidix_grkey_get(vidix_grkey_t *gr_key)
+{
+    return(vdlGetGrKeys(vidix_handler, gr_key));
+}
+
+int vidix_grkey_set(const vidix_grkey_t *gr_key)
+{
+    return(vdlSetGrKeys(vidix_handler, gr_key));
 }

Index: vosub_vidix.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vosub_vidix.h	18 Jan 2002 10:41:31 -0000	1.4
+++ vosub_vidix.h	18 Jan 2002 18:14:44 -0000	1.5
@@ -27,5 +27,10 @@
 uint32_t vidix_draw_frame(uint8_t *src[]);
 void     vidix_flip_page(void);
 void     vidix_draw_osd(void);
+
+#include "../vidix/vidix.h"
+/* graphic keys */
+int vidix_grkey_get(vidix_grkey_t *gr_key);
+int vidix_grkey_set(const vidix_grkey_t *gr_key);
 
 #endif