diff options
| author | wm4 <wm4@nowhere> | 2012-12-12 22:56:41 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-12-12 22:56:41 +0100 |
| commit | 962a97a2dbf6997a7d1f92e63a7d5c1e25870464 (patch) | |
| tree | af8a18aaa8c04d36165e16d45081ca958d25ba98 /sub | |
| parent | 0fba387f72808c0298b3c34874d1388d8fd34def (diff) | |
| download | mpv-962a97a2dbf6997a7d1f92e63a7d5c1e25870464.tar.bz2 mpv-962a97a2dbf6997a7d1f92e63a7d5c1e25870464.tar.xz | |
sd_lavc: keep subs on subtitle track switching
Keep the currently displayed subtitles even when the user cycles through
subtitle tracks, and the subtitle is decoded by libavcodec (such as
vobsubs). Do this by not clearing the subtitles on reset(). reset() is
also called on seek, so check the start PTS whether the subtitle should
really be displayed (there's already an end PTS). Note that sd_ass does
essentially something similar.
The existing code has checks for whether the PTS reported by the demuxer
is invalid (MP_NOPTS_VALUE). I don't know under what circumstances this
can happens, so fall back to the old behavior if the PTS is invalid.
Diffstat (limited to 'sub')
| -rw-r--r-- | sub/sd_lavc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c index fbffc175d4..f1f93b480e 100644 --- a/sub/sd_lavc.c +++ b/sub/sd_lavc.c @@ -36,6 +36,7 @@ struct sd_lavc_priv { struct sub_bitmap *outbitmaps; struct osd_bmp_indexed *imgs; bool bitmaps_changed; + double pts; double endpts; }; @@ -107,6 +108,7 @@ static void clear(struct sd_lavc_priv *priv) talloc_free(priv->imgs); priv->imgs = NULL; priv->bitmaps_changed = true; + priv->pts = MP_NOPTS_VALUE; priv->endpts = MP_NOPTS_VALUE; if (priv->have_sub) avsubtitle_free(&priv->sub); @@ -165,6 +167,7 @@ static void decode(struct sh_sub *sh, struct osd_state *osd, void *data, b->y = r->y; } priv->count = sub.num_rects; + priv->pts = pts; priv->endpts = endpts; break; default: @@ -181,6 +184,8 @@ static void get_bitmaps(struct sh_sub *sh, struct osd_state *osd, { struct sd_lavc_priv *priv = sh->context; + if (priv->pts != MP_NOPTS_VALUE && pts < priv->pts) + return; if (priv->endpts != MP_NOPTS_VALUE && (pts >= priv->endpts || pts < priv->endpts - 300)) clear(priv); @@ -213,7 +218,8 @@ static void reset(struct sh_sub *sh, struct osd_state *osd) { struct sd_lavc_priv *priv = sh->context; - clear(priv); + if (priv->pts == MP_NOPTS_VALUE) + clear(priv); // lavc might not do this right for all codecs; may need close+reopen avcodec_flush_buffers(priv->avctx); } |