mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 03:52:22 +02:00
Code

player: don't enable demuxer readahead before selecting tracks

Browse Source 
This is for the ordered chapters case only. In theory this could have
resulted in initial audio, video or subs missing, although it didn't
happen in practice (because no streams were selected, thus the demuxer
thread didn't actually try to read anything). It's still better to make
this explicit.

Also, timeline_set_part() can be private to loadfile.c.
This commit is contained in:
wm4 2015-01-16 20:15:30 +01:00
parent 730db25b1b
commit 280f123f35
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
player/core.h
View File

@ -385,7 +385,6 @@ void mp_mark_user_track_selection(struct MPContext *mpctx, int order,
enum stream_type type);
struct track *mp_track_by_tid(struct MPContext *mpctx, enum stream_type type,
int tid);
bool timeline_set_part(struct MPContext *mpctx, int i, bool force);
double timeline_set_from_time(struct MPContext *mpctx, double pts, bool *need_reset);
void add_demuxer_tracks(struct MPContext *mpctx, struct demuxer *demuxer);
bool mp_remove_track(struct MPContext *mpctx, struct track *track);

10
player/loadfile.c
View File

@ -270,13 +270,13 @@ static void enable_demux_thread(struct MPContext *mpctx)
}
}
bool timeline_set_part(struct MPContext *mpctx, int i, bool force)
static bool timeline_set_part(struct MPContext *mpctx, int i, bool initial)
{
struct timeline_part *p = mpctx->timeline + mpctx->timeline_part;
struct timeline_part *n = mpctx->timeline + i;
mpctx->timeline_part = i;
mpctx->video_offset = n->start - n->source_start;
if (n->source == p->source && !force)
if (n->source == p->source && !initial)
return false;
uninit_audio_chain(mpctx);
@ -313,9 +313,11 @@ bool timeline_set_part(struct MPContext *mpctx, int i, bool force)
}
}
}
reselect_demux_streams(mpctx);
enable_demux_thread(mpctx);
if (!initial) {
reselect_demux_streams(mpctx);
enable_demux_thread(mpctx);
}
return true;
}