summaryrefslogtreecommitdiffstats
path: root/sub
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-12-05 05:24:18 +0200
committerUoti Urpala <uau@mplayer2.org>2011-12-06 05:03:39 +0200
commitad0348cf0a7459c0581deaf3ed7d8b73a12cc73f (patch)
tree206975ec6720a6d3605cc1b9d4c1a603898b3458 /sub
parentc9553ce82fdb80811196f40b9c1eaaa3b2351e01 (diff)
downloadmpv-ad0348cf0a7459c0581deaf3ed7d8b73a12cc73f.tar.bz2
mpv-ad0348cf0a7459c0581deaf3ed7d8b73a12cc73f.tar.xz
core, vo: modify OSD redraw architecture, support EOSD
Previously the core sent VFCTRL_REDRAW_OSD to change OSD contents over the current frame. Change this to VFCTRL_REDRAW_FRAME followed by normal EOSD and OSD drawing calls, then vo_flip_page(). The new version supports changing EOSD contents for libass-rendered subtitles and simplifies the redraw support code needed per VO. vo_xv doesn't support EOSD changes because it relies on vf_ass to render EOSD contents earlier in the filter chain. vo_xv logic is additionally simplified because the previous commit removed the need to track the status of current and next images separately (now each frame is guaranteed to become "visible" soon after we receive it as "next", with no VO code running in the interval between).
Diffstat (limited to 'sub')
-rw-r--r--sub/sub.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sub/sub.h b/sub/sub.h
index e7ded2556a..2f8c4e0ffc 100644
--- a/sub/sub.h
+++ b/sub/sub.h
@@ -75,6 +75,7 @@ struct osd_state {
char *osd_text;
struct font_desc *sub_font;
struct ass_track *ass_track;
+ double pts;
bool ass_track_changed;
bool vsfilter_aspect;
};