diff options
author | wm4 <wm4@nowhere> | 2013-11-23 21:37:15 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-11-23 21:37:15 +0100 |
commit | 639e672bd153e06cfc01ced6c2a48b45870e8f31 (patch) | |
tree | 7b683231216221252860c9b686f744ad7354fa2f /mpvcore/player/mp_core.h | |
parent | 3486302514db31b8086f46226d9b46d53810d1e7 (diff) | |
download | mpv-639e672bd153e06cfc01ced6c2a48b45870e8f31.tar.bz2 mpv-639e672bd153e06cfc01ced6c2a48b45870e8f31.tar.xz |
player: rearrange how subtitle context and stream headers are used
Use sh_stream over sh_sub. Use dec_sub (and mpctx->d_sub) instead of the
stream header. This aligns the subtitle code with the recent audio and
video refactoring.
sh_sub still has the decoder context, though. This is because we want to
avoid reinit when switching segments with ordered chapters. (Reinit is
fast, except for creating the ASS_Renderer, which in turn triggers
fontconfig.) Not sure how much this matters, though, because the initial
segment switch will lazily initialize the decoder anyway.
Diffstat (limited to 'mpvcore/player/mp_core.h')
-rw-r--r-- | mpvcore/player/mp_core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mpvcore/player/mp_core.h b/mpvcore/player/mp_core.h index f372c4e137..0be7e1df1f 100644 --- a/mpvcore/player/mp_core.h +++ b/mpvcore/player/mp_core.h @@ -199,10 +199,10 @@ typedef struct MPContext { struct track *current_track[STREAM_TYPE_COUNT]; struct sh_stream *sh[STREAM_TYPE_COUNT]; - struct sh_sub *sh_sub; // same as sh[STREAM_SUB]->sub struct dec_video *d_video; struct dec_audio *d_audio; + struct dec_sub *d_sub; // Uses: accessing metadata (consider ordered chapters case, where the main // demuxer defines metadata), or special purpose demuxers like TV. |