From 6da11789ae51652445760369e1d61299fdbb81d8 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 16 Sep 2013 00:27:53 +0200 Subject: mplayer: read subtitle packets as soon as possible Call update_subtitles() on every iteration of the playloop, so that subtitle packets are read as soon as possible, instead of every time a video frame is displayed. This helps in case the packet queue is swamped with subtitle packets, which can happen with certain insane mkv files. The change will simply cause the subtitle queue to be emptied on each playloop iteration. The timestamps update_subtitles() uses for display are the same before and after this commit. (Important for files which have subtitle packets with timestamps or duration not set.) --- mpvcore/mplayer.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'mpvcore') diff --git a/mpvcore/mplayer.c b/mpvcore/mplayer.c index fe5b120c50..381f3385fd 100644 --- a/mpvcore/mplayer.c +++ b/mpvcore/mplayer.c @@ -1818,7 +1818,7 @@ static void reset_subtitles(struct MPContext *mpctx) osd_changed(mpctx->osd, OSDTYPE_SUB); } -static void update_subtitles(struct MPContext *mpctx, double refpts_tl) +static void update_subtitles(struct MPContext *mpctx) { struct MPOpts *opts = mpctx->opts; if (!(mpctx->initialized_flags & INITIALIZED_SUB)) @@ -1836,7 +1836,7 @@ static void update_subtitles(struct MPContext *mpctx, double refpts_tl) mpctx->osd->video_offset = track->under_timeline ? mpctx->video_offset : 0; - double refpts_s = refpts_tl - mpctx->osd->video_offset; + double refpts_s = mpctx->playback_pts - mpctx->osd->video_offset; double curpts_s = refpts_s + opts->sub_delay; if (!track->preloaded) { @@ -2842,8 +2842,6 @@ static bool redraw_osd(struct MPContext *mpctx) if (vo_redraw_frame(vo) < 0) return false; - if (mpctx->sh_video) - update_subtitles(mpctx, mpctx->sh_video->pts); draw_osd(mpctx); vo_flip_page(vo, 0, -1); @@ -3692,7 +3690,7 @@ static void run_playloop(struct MPContext *mpctx) mpctx->video_pts = sh_video->pts; mpctx->last_vo_pts = mpctx->video_pts; mpctx->playback_pts = mpctx->video_pts; - update_subtitles(mpctx, sh_video->pts); + update_subtitles(mpctx); update_osd_msg(mpctx); draw_osd(mpctx); @@ -3779,11 +3777,10 @@ static void run_playloop(struct MPContext *mpctx) } mpctx->playback_pts = a_pos; print_status(mpctx); - - if (!mpctx->sh_video) - update_subtitles(mpctx, a_pos); } + update_subtitles(mpctx); + /* It's possible for the user to simultaneously switch both audio * and video streams to "disabled" at runtime. Handle this by waiting * rather than immediately stopping playback due to EOF. -- cgit v1.2.3