VideoPlayer: finish old a/v stream before opening a new stream

FernetMenta · Dec 11, 2015 · b14a05a · b14a05a
1 parent ea5356c
commit b14a05a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp
@@ -1398,6 +1398,12 @@ void CVideoPlayer::Process()
       if(next == CDVDInputStream::NEXTSTREAM_OPEN)
       {
         SAFE_DELETE(m_pDemuxer);
+
+        SetCaching(CACHESTATE_DONE);
+        CLog::Log(LOGNOTICE, "VideoPlayer: next stream, wait for old streams to be finished");
+        CloseStream(m_CurrentAudio, true);
+        CloseStream(m_CurrentVideo, true);
+
         m_CurrentAudio.stream = NULL;
         m_CurrentVideo.stream = NULL;
         m_CurrentSubtitle.stream = NULL;

diff --git a/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp b/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp
@@ -194,7 +194,8 @@ void CVideoPlayerAudio::CloseStream(bool bWaitForBuffers)
   bool bWait = bWaitForBuffers && m_speed > 0 && !CAEFactory::IsSuspended();
 
   // wait until buffers are empty
-  if (bWait) m_messageQueue.WaitUntilEmpty();
+  if (bWait)
+    m_messageQueue.WaitUntilEmpty();
 
   // send abort message to the audio queue
   m_messageQueue.Abort();

diff --git a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp
@@ -249,7 +249,8 @@ void CVideoPlayerVideo::OpenStream(CDVDStreamInfo &hint, CDVDVideoCodec* codec)
 void CVideoPlayerVideo::CloseStream(bool bWaitForBuffers)
 {
   // wait until buffers are empty
-  if (bWaitForBuffers && m_speed > 0) m_messageQueue.WaitUntilEmpty();
+  if (bWaitForBuffers && m_speed > 0)
+    m_messageQueue.WaitUntilEmpty();
 
   m_messageQueue.Abort();