[Mplayer-cvslog] CVS: main/libmpcodecs dec_video.c,1.130,1.131 vf.h,1.6,1.7 vf_vo.c,1.7,1.8

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mplayer:/var/tmp.root/cvs-serv28039

Modified Files:
	dec_video.c vf.h vf_vo.c 
Log Message:
OSD handled by vf control()

Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_video.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- dec_video.c	7 Apr 2002 17:42:31 -0000	1.130
+++ dec_video.c	15 Apr 2002 22:41:06 -0000	1.131
@@ -194,16 +194,15 @@
 }
 #endif
 
-if(!mpi) return 0; // error / skipped frame
-
 t2=GetTimer();t=t2-t;
 tt = t*0.000001f;
 video_time_usage+=tt;
 
-if(drop_frame) return 0;
+if(!mpi || drop_frame) return 0; // error / skipped frame
 
 //vo_draw_image(video_out,mpi);
 vf->put_image(vf,mpi);
+vf->control(vf,VFCTRL_DRAW_OSD,NULL);
 
     t2=GetTimer()-t2;
     tt=t2*0.000001f;

Index: vf.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vf.h	11 Apr 2002 20:56:17 -0000	1.6
+++ vf.h	15 Apr 2002 22:41:06 -0000	1.7
@@ -50,6 +50,8 @@
 #define VFCTRL_SET_PP_LEVEL 5 /* set postprocessing level */
 #define VFCTRL_SET_EQUALIZER 6 /* set color options (brightness,contrast etc) */
 
+#define VFCTRL_DRAW_OSD 7
+
 #include "vfcap.h"
 
 // functions:

Index: vf_vo.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_vo.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vf_vo.c	13 Apr 2002 19:14:31 -0000	1.7
+++ vf_vo.c	15 Apr 2002 22:41:06 -0000	1.8
@@ -42,6 +42,11 @@
 
 static int control(struct vf_instance_s* vf,
         int request, void* data){
+    switch(request){
+    case VFCTRL_DRAW_OSD:
+	video_out->draw_osd();
+	return CONTROL_TRUE;
+    }
     // return video_out->control(request,data);
     return CONTROL_UNKNOWN;
 }