From d419ecd161634e79dab3ac57d57c4bccba2adcdc Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Thu, 15 Jan 2009 01:07:12 +0200 Subject: OSD: Ensure that OSD content is drawn in filter-added frames Move the OSD drawing calls from filter_video() to higher-level code to ensure that VOs will draw the OSD also in filter-added frames, which are displayed without a separate call to filter_video(). --- libmpcodecs/dec_video.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'libmpcodecs/dec_video.c') diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c index 8cdc3e7b1d..ef44399e82 100644 --- a/libmpcodecs/dec_video.c +++ b/libmpcodecs/dec_video.c @@ -455,20 +455,13 @@ void *decode_video(sh_video_t *sh_video, unsigned char *start, int in_size, return mpi; } -int filter_video(sh_video_t *sh_video, void *frame, double pts, - struct osd_state *osd) +int filter_video(sh_video_t *sh_video, void *frame, double pts) { mp_image_t *mpi = frame; unsigned int t2 = GetTimer(); vf_instance_t *vf = sh_video->vfilter; // apply video filters and call the leaf vo/ve int ret = vf->put_image(vf, mpi, pts); - if (ret > 0) { -#ifdef CONFIG_ASS - vf->control(vf, VFCTRL_DRAW_EOSD, NULL); -#endif - vf->control(vf, VFCTRL_DRAW_OSD, osd); - } t2 = GetTimer() - t2; vout_time_usage += t2 * 0.000001; -- cgit v1.2.3