diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-24 01:53:58 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-24 01:53:58 +0300 |
| commit | a232f564d3f271277135276281c03cca7807ef16 (patch) | |
| tree | 63c0ebd5b39094e2cc24da83a4e5ce889964b003 /libmpcodecs/dec_video.c | |
| parent | de560e8167c21a8fd9ea34f5f42f377102d65232 (diff) | |
| download | mpv-a232f564d3f271277135276281c03cca7807ef16.tar.bz2 mpv-a232f564d3f271277135276281c03cca7807ef16.tar.xz | |
Create a context struct for OSD state
This commit creates the struct and passes it to some functions that
needs to access OSD state but does not yet move much data from globals
to it.
vf_expand accesses the OSD state for rendering purposes outside of the
normal OSD draw time. The way this currently works is suboptimal, but
I did not attempt to clean it up now. To keep things working the same
way vf_expand needs to know the address of the state object to be able
to access the data even in the functions that should normally not need
it. For that purpose this commit adds a VFCTRL to tell vf_expand the
address of the object.
Diffstat (limited to 'libmpcodecs/dec_video.c')
| -rw-r--r-- | libmpcodecs/dec_video.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c index 9293ee4b8d..9c9de3b51e 100644 --- a/libmpcodecs/dec_video.c +++ b/libmpcodecs/dec_video.c @@ -446,7 +446,8 @@ 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) +int filter_video(sh_video_t *sh_video, void *frame, double pts, + struct osd_state *osd) { mp_image_t *mpi = frame; unsigned int t2 = GetTimer(); @@ -454,7 +455,7 @@ int filter_video(sh_video_t *sh_video, void *frame, double pts) // apply video filters and call the leaf vo/ve int ret = vf->put_image(vf, mpi, pts); if (ret > 0) { - vf->control(vf, VFCTRL_DRAW_OSD, NULL); + vf->control(vf, VFCTRL_DRAW_OSD, osd); #ifdef USE_ASS vf->control(vf, VFCTRL_DRAW_EOSD, NULL); #endif |