summaryrefslogtreecommitdiffstats
path: root/player/scripting.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-10-06 21:20:38 +0200
committerwm4 <wm4@nowhere>2014-10-06 21:49:26 +0200
commit5fb05940f1b4d0dad208d94ddd73d78520d8ce03 (patch)
tree9be531822bb1cd7e2fc1daab2aa96eaf00043945 /player/scripting.c
parentd26104351b65a212c03ec08679cb45a3aa2f0a32 (diff)
downloadmpv-5fb05940f1b4d0dad208d94ddd73d78520d8ce03.tar.bz2
mpv-5fb05940f1b4d0dad208d94ddd73d78520d8ce03.tar.xz
player: open stream and demuxer asynchronously
Run opening the stream and opening the demuxer in a separate thread. This should remove the last code paths in which the player can normally get blocked on network. When the stream is opened, the player will still react to input and so on. Commands to abort opening can also be handled properly, instead of using some of the old hacks in input.c. The only thing the user can really do is aborting loading by navigating the playlist or quitting. Whether playback abort works depends on the stream implementation; with normal network, this will depend on what libavformat (via "interrupt" callback) does. Some pain is caused by DVD/BD/DVB. These want to reload the demuxer sometimes. DVB wants it in order to discard old, inactive streams. DVD/BD for the same reason, and also for reloading stream languages and similar metadata. This means the stream and the demuxer have to be loaded separately. One minor detail is that we now need to copy all global options. This wasn't really needed before, because the options were accessed on opening only, but since opening is now on a separate thread, this obviously becomes a necessity.
Diffstat (limited to 'player/scripting.c')
-rw-r--r--player/scripting.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/player/scripting.c b/player/scripting.c
index 0b5993c8e5..6e2a5a4e2d 100644
--- a/player/scripting.c
+++ b/player/scripting.c
@@ -90,10 +90,8 @@ static void *script_thread(void *p)
static void wait_loaded(struct MPContext *mpctx)
{
- while (!mp_clients_all_initialized(mpctx)) {
- mp_wait_events(mpctx, 1e9);
- mp_process_input(mpctx);
- }
+ while (!mp_clients_all_initialized(mpctx))
+ mp_idle(mpctx);
}
static void mp_load_script(struct MPContext *mpctx, const char *fname)