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

loadfile: don't always accidentally always prefetching

Browse Source 
demux_start_prefetch() was called unconditionally in two cases. This is
completely wrong. I'm not sure what part of my brain died off that
something this obviously wrong went in.

The prefetch case is a bit more complicated. It's a different thread, so
you can't access just access mpctx->opts there. So add an explicit field
for this, which is the simplest way to get this done. (Even if it's bad
factoring.)

Fixes: c1f1a0845e
Fixes: 556e204a11
This commit is contained in:
wm4 2019-09-29 02:24:29 +02:00
parent a604dc12be
commit 3b13a47993
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
player/core.h
View File

@ -457,6 +457,7 @@ typedef struct MPContext {
char *open_url;
char *open_format;
int open_url_flags;
bool open_for_prefetch;
// --- All fields below are owned by open_thread, unless open_done was set
// to true.
struct demuxer *open_res_demuxer;

26
player/loadfile.c
View File

@ -983,13 +983,15 @@ static void *open_demux_thread(void *ctx)
if (demux) {
MP_VERBOSE(mpctx, "Opening done: %s\n", mpctx->open_url);
int num_streams = demux_get_num_stream(demux);
for (int n = 0; n < num_streams; n++) {
struct sh_stream *sh = demux_get_stream(demux, n);
demuxer_select_track(demux, sh, MP_NOPTS_VALUE, true);
}
if (mpctx->open_for_prefetch && !demux->fully_read) {
int num_streams = demux_get_num_stream(demux);
for (int n = 0; n < num_streams; n++) {
struct sh_stream *sh = demux_get_stream(demux, n);
demuxer_select_track(demux, sh, MP_NOPTS_VALUE, true);
}
demux_start_prefetch(demux);
demux_start_prefetch(demux);
}
} else {
MP_VERBOSE(mpctx, "Opening failed or was aborted: %s\n", mpctx->open_url);
@ -1026,7 +1028,8 @@ static void cancel_open(struct MPContext *mpctx)
}
// Setup all the field to open this url, and make sure a thread is running.
static void start_open(struct MPContext *mpctx, char *url, int url_flags)
static void start_open(struct MPContext *mpctx, char *url, int url_flags,
bool for_prefetch)
{
cancel_open(mpctx);
@ -1039,6 +1042,7 @@ static void start_open(struct MPContext *mpctx, char *url, int url_flags)
mpctx->open_url = talloc_strdup(NULL, url);
mpctx->open_format = talloc_strdup(NULL, mpctx->opts->demuxer_name);
mpctx->open_url_flags = url_flags;
mpctx->open_for_prefetch = for_prefetch;
if (mpctx->opts->load_unsafe_playlists)
mpctx->open_url_flags = 0;
@ -1075,7 +1079,7 @@ static void open_demux_reentrant(struct MPContext *mpctx)
}
if (!mpctx->open_active)
start_open(mpctx, url, mpctx->playing->stream_flags);
start_open(mpctx, url, mpctx->playing->stream_flags, false);
// User abort should cancel the opener now.
mp_cancel_set_parent(mpctx->open_cancel, mpctx->playback_abort);
@ -1106,7 +1110,7 @@ void prefetch_next(struct MPContext *mpctx)
struct playlist_entry *new_entry = mp_next_file(mpctx, +1, false, false);
if (new_entry && !mpctx->open_active && new_entry->filename) {
MP_VERBOSE(mpctx, "Prefetching: %s\n", new_entry->filename);
start_open(mpctx, new_entry->filename, new_entry->stream_flags);
start_open(mpctx, new_entry->filename, new_entry->stream_flags, true);
}
}
@ -1553,9 +1557,9 @@ static void play_current_file(struct MPContext *mpctx)
goto terminate_playback;
}
demux_start_prefetch(mpctx->demuxer);
if (opts->demuxer_cache_wait) {
demux_start_prefetch(mpctx->demuxer);
while (!mpctx->stop_play) {
struct demux_reader_state s;
demux_get_reader_state(mpctx->demuxer, &s);