github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-07-31 16:29:58 +02:00
Code Releases Activity

sub: change when/how subtitles are read completely

Browse Source 
Most text subtitles are read completely on loading (libavformat works
this way, and there are good reasons to do it on the higher levels too).
This leads to some messy problems. For example, the subtitle path is the
only one which might read packets during decoder initialization. This is
not neccessary; get rid of it.

This fixes a potential problem of seeking to position 0 for image
subtitles on init, and if the start position is not at the beginning of
the timeline.
This commit is contained in:
wm4 2016-01-21 23:49:25 +01:00
parent 04ec417d41
commit 50c701574d
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
player/sub.c
View File

@ -100,6 +100,14 @@ static bool update_subtitle(struct MPContext *mpctx, double video_pts,
video_pts -= opts->sub_delay;
if (!track->preloaded && track->demuxer->fully_read && !opts->sub_clear_on_seek)
{
// Assume fully_read implies no interleaved audio/video streams.
// (Reading packets will change the demuxer position.)
demux_seek(track->demuxer, 0, SEEK_ABSOLUTE);
track->preloaded = sub_read_all_packets(track->d_sub);
}
if (!track->preloaded) {
if (!sub_read_packets(dec_sub, video_pts))
return false;
@ -124,8 +132,6 @@ bool update_subtitles(struct MPContext *mpctx, double video_pts)
static bool init_subdec(struct MPContext *mpctx, struct track *track)
{
struct MPOpts *opts = mpctx->opts;
assert(!track->d_sub);
if (!track->demuxer || !track->stream)
@ -141,16 +147,6 @@ static bool init_subdec(struct MPContext *mpctx, struct track *track)
double fps = v_c ? v_c->fps : 25;
sub_control(track->d_sub, SD_CTRL_SET_VIDEO_DEF_FPS, &fps);
// Don't do this if the file has video/audio streams. Don't do it even
// if it has only sub streams, because reading packets will change the
// demuxer position.
if (track->is_external && !opts->sub_clear_on_seek) {
demux_seek(track->demuxer, 0, SEEK_ABSOLUTE);
track->preloaded = sub_read_all_packets(track->d_sub);
if (track->preloaded)
demux_stop_thread(track->demuxer);
}
return true;
}