[vlc-commits] demux: adaptative: commit queued commands on demuxer Open()

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Oct  6 20:14:09 2015 +0200| [8a42f952b804bc340d6caaf3820520edc24b7b1f] | committer: Francois Cartegnie

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8a42f952b804bc340d6caaf3820520edc24b7b1f
---

 modules/demux/adaptative/Streams.cpp          |    1 +
 modules/demux/adaptative/plumbing/Demuxer.cpp |    2 +-
 modules/demux/dash/DASHStream.cpp             |    1 +
 modules/demux/hls/HLSStreams.cpp              |    1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/demux/adaptative/Streams.cpp b/modules/demux/adaptative/Streams.cpp
index 5cc57a1..dac47da 100644
--- a/modules/demux/adaptative/Streams.cpp
+++ b/modules/demux/adaptative/Streams.cpp
@@ -233,6 +233,7 @@ bool AbstractStream::restartDemux()
         /* Restart with ignoring pushes to queue */
         return demuxer->restart(fakeesout->commandsqueue);
     }
+    fakeesout->commandsqueue.Commit();
     return true;
 }
 
diff --git a/modules/demux/adaptative/plumbing/Demuxer.cpp b/modules/demux/adaptative/plumbing/Demuxer.cpp
index 38703ea..6be60d4 100644
--- a/modules/demux/adaptative/plumbing/Demuxer.cpp
+++ b/modules/demux/adaptative/plumbing/Demuxer.cpp
@@ -106,7 +106,7 @@ void Demuxer::drain()
 
 int Demuxer::demux(mtime_t)
 {
-    if(b_eof)
+    if(!p_demux || b_eof)
         return VLC_DEMUXER_EOF;
     int i_ret = demux_Demux(p_demux);
     if(i_ret != VLC_DEMUXER_SUCCESS)
diff --git a/modules/demux/dash/DASHStream.cpp b/modules/demux/dash/DASHStream.cpp
index 10d7836..87a88f8 100644
--- a/modules/demux/dash/DASHStream.cpp
+++ b/modules/demux/dash/DASHStream.cpp
@@ -55,6 +55,7 @@ AbstractDemuxer * DASHStream::createDemux(const StreamFormat &format)
         delete ret;
         ret = NULL;
     }
+    else fakeesout->commandsqueue.Commit();
 
     return ret;
 }
diff --git a/modules/demux/hls/HLSStreams.cpp b/modules/demux/hls/HLSStreams.cpp
index d8c34e4..989f762 100644
--- a/modules/demux/hls/HLSStreams.cpp
+++ b/modules/demux/hls/HLSStreams.cpp
@@ -73,6 +73,7 @@ AbstractDemuxer * HLSStream::createDemux(const StreamFormat &format)
         delete ret;
         ret = NULL;
     }
+    else fakeesout->commandsqueue.Commit();
 
     return ret;
 }