RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

demux: reduce log spam if threading is disabled

This commit is contained in:
wm4 2014-08-11 15:53:01 +02:00
parent 37357e2265
commit 9dd160ea97
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
demux/demux.c
View File

@ -1172,13 +1172,15 @@ int demux_control(demuxer_t *demuxer, int cmd, void *arg)
demux_pause(demuxer); demux_pause(demuxer);
if (cmd == DEMUXER_CTRL_STREAM_CTRL) { if (cmd == DEMUXER_CTRL_STREAM_CTRL) {
struct demux_ctrl_stream_ctrl *c = arg; struct demux_ctrl_stream_ctrl *c = arg;
MP_VERBOSE(demuxer, "blocking for STREAM_CTRL %d\n", c->ctrl); if (in->threading)
MP_VERBOSE(demuxer, "blocking for STREAM_CTRL %d\n", c->ctrl);
c->res = stream_control(demuxer->stream, c->ctrl, c->arg); c->res = stream_control(demuxer->stream, c->ctrl, c->arg);
if (c->res != STREAM_UNSUPPORTED) if (c->res != STREAM_UNSUPPORTED)
r = DEMUXER_CTRL_OK; r = DEMUXER_CTRL_OK;
} }
if (r != DEMUXER_CTRL_OK) { if (r != DEMUXER_CTRL_OK) {
MP_VERBOSE(demuxer, "blocking for DEMUXER_CTRL %d\n", cmd); if (in->threading)
MP_VERBOSE(demuxer, "blocking for DEMUXER_CTRL %d\n", cmd);
if (demuxer->desc->control) if (demuxer->desc->control)
r = demuxer->desc->control(demuxer->in->d_thread, cmd, arg); r = demuxer->desc->control(demuxer->in->d_thread, cmd, arg);
} }
@ -1201,12 +1203,15 @@ void demux_pause(demuxer_t *demuxer)
struct demux_internal *in = demuxer->in; struct demux_internal *in = demuxer->in;
assert(demuxer == in->d_user); assert(demuxer == in->d_user);
if (!in->threading)
return;
MP_VERBOSE(in, "pause demux thread\n"); MP_VERBOSE(in, "pause demux thread\n");
pthread_mutex_lock(&in->lock); pthread_mutex_lock(&in->lock);
in->thread_request_pause++; in->thread_request_pause++;
pthread_cond_signal(&in->wakeup); pthread_cond_signal(&in->wakeup);
while (in->threading && !in->thread_paused) while (!in->thread_paused)
pthread_cond_wait(&in->wakeup, &in->lock); pthread_cond_wait(&in->wakeup, &in->lock);
pthread_mutex_unlock(&in->lock); pthread_mutex_unlock(&in->lock);
} }
@ -1216,6 +1221,9 @@ void demux_unpause(demuxer_t *demuxer)
struct demux_internal *in = demuxer->in; struct demux_internal *in = demuxer->in;
assert(demuxer == in->d_user); assert(demuxer == in->d_user);
if (!in->threading)
return;
pthread_mutex_lock(&in->lock); pthread_mutex_lock(&in->lock);
assert(in->thread_request_pause > 0); assert(in->thread_request_pause > 0);
in->thread_request_pause--; in->thread_request_pause--;