Commit 8a42f952 authored by Francois Cartegnie's avatar Francois Cartegnie

demux: adaptative: commit queued commands on demuxer Open()

parent dd166718
...@@ -233,6 +233,7 @@ bool AbstractStream::restartDemux() ...@@ -233,6 +233,7 @@ bool AbstractStream::restartDemux()
/* Restart with ignoring pushes to queue */ /* Restart with ignoring pushes to queue */
return demuxer->restart(fakeesout->commandsqueue); return demuxer->restart(fakeesout->commandsqueue);
} }
fakeesout->commandsqueue.Commit();
return true; return true;
} }
......
...@@ -106,7 +106,7 @@ void Demuxer::drain() ...@@ -106,7 +106,7 @@ void Demuxer::drain()
int Demuxer::demux(mtime_t) int Demuxer::demux(mtime_t)
{ {
if(b_eof) if(!p_demux || b_eof)
return VLC_DEMUXER_EOF; return VLC_DEMUXER_EOF;
int i_ret = demux_Demux(p_demux); int i_ret = demux_Demux(p_demux);
if(i_ret != VLC_DEMUXER_SUCCESS) if(i_ret != VLC_DEMUXER_SUCCESS)
......
...@@ -55,6 +55,7 @@ AbstractDemuxer * DASHStream::createDemux(const StreamFormat &format) ...@@ -55,6 +55,7 @@ AbstractDemuxer * DASHStream::createDemux(const StreamFormat &format)
delete ret; delete ret;
ret = NULL; ret = NULL;
} }
else fakeesout->commandsqueue.Commit();
return ret; return ret;
} }
......
...@@ -73,6 +73,7 @@ AbstractDemuxer * HLSStream::createDemux(const StreamFormat &format) ...@@ -73,6 +73,7 @@ AbstractDemuxer * HLSStream::createDemux(const StreamFormat &format)
delete ret; delete ret;
ret = NULL; ret = NULL;
} }
else fakeesout->commandsqueue.Commit();
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment