[AE] Fix potential engine deadlock after sink de-inits

xbmc · Sep 2, 2012 · eb50bb2 · eb50bb2
1 parent 24a7147
commit eb50bb2
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 13 deletions.
diff --git a/xbmc/cores/AudioEngine/AESinkFactory.cpp b/xbmc/cores/AudioEngine/AESinkFactory.cpp
@@ -84,6 +84,7 @@ void CAESinkFactory::ParseDevice(std::string &device, std::string &driver)
   } \
   sink->Deinitialize(); \
   delete sink; \
+  sink = NULL; \
 }
 
 IAESink *CAESinkFactory::Create(std::string &device, AEAudioFormat &desiredFormat, bool rawPassthrough)

diff --git a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
@@ -672,7 +672,7 @@ void CSoftAE::PauseStream(CSoftAEStream *stream)
   stream->m_paused = true;
   streamLock.Leave();
 
-  InternalOpenSink();
+  OpenSink();
 }
 
 void CSoftAE::ResumeStream(CSoftAEStream *stream)
@@ -683,7 +683,7 @@ void CSoftAE::ResumeStream(CSoftAEStream *stream)
   streamLock.Leave();
 
   m_streamsPlaying = true;
-  InternalOpenSink();
+  OpenSink();
 }
 
 void CSoftAE::Stop()
@@ -721,7 +721,7 @@ IAEStream *CSoftAE::MakeStream(enum AEDataFormat dataFormat, unsigned int sample
   m_newStreams.push_back(stream);
   streamLock.Leave();
 
-  InternalOpenSink();
+  OpenSink();
   return stream;
 }
 
@@ -813,7 +813,7 @@ IAEStream *CSoftAE::FreeStream(IAEStream *stream)
 
   /* if it was the master stream we need to reopen before deletion */
   if (m_masterStream == stream)
-    InternalOpenSink();
+    OpenSink();
 
   delete (CSoftAEStream*)stream;
   return NULL;
@@ -938,6 +938,8 @@ void CSoftAE::Run()
       m_wake.WaitMSec(SOFTAE_IDLE_WAIT_MSEC);
     }
 
+    m_wake.Reset();
+
     bool restart = false;
 
     if ((this->*m_outputStageFn)(hasAudio) > 0)
@@ -1136,7 +1138,9 @@ int CSoftAE::RunRawOutputStage(bool hasAudio)
     data = m_converted;
   }
 
-  int wroteFrames = m_sink->AddPackets((uint8_t *)data, m_sinkFormat.m_frames, hasAudio);
+  int wroteFrames = 0;
+  if (m_sink)
+    wroteFrames = m_sink->AddPackets((uint8_t *)data, m_sinkFormat.m_frames, hasAudio);
 
   /* Return value of INT_MAX signals error in sink - restart */
   if (wroteFrames == INT_MAX)

diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp
@@ -276,7 +276,7 @@ bool CAESinkWASAPI::Initialize(AEAudioFormat &format, std::string &device)
 
 void CAESinkWASAPI::Deinitialize()
 {
-  if (!m_initialized & !m_isDirty)
+  if (!m_initialized && !m_isDirty)
     return;
 
   if (m_running)
@@ -292,10 +292,13 @@ void CAESinkWASAPI::Deinitialize()
   }
   m_running = false;
 
+  CloseHandle(m_needDataEvent);
+
+  Sleep((DWORD)(m_sinkLatency * 1.1 * 1000.0)); //let buffers drain
+
   SAFE_RELEASE(m_pRenderClient);
   SAFE_RELEASE(m_pAudioClient);
   SAFE_RELEASE(m_pDevice);
-  CloseHandle(m_needDataEvent);
 
   m_initialized = false;
 }
@@ -424,14 +427,19 @@ unsigned int CAESinkWASAPI::AddPackets(uint8_t *data, unsigned int frames, bool
   /* Wait for Audio Driver to tell us it's got a buffer available */
   DWORD eventAudioCallback = WaitForSingleObject(m_needDataEvent, 1100);
 
-  if (eventAudioCallback != WAIT_OBJECT_0)
+  if (eventAudioCallback != WAIT_OBJECT_0 || !&buf)
   {
     // Event handle timed out - flag sink as dirty for re-initializing
     CLog::Log(LOGERROR, __FUNCTION__": Endpoint Buffer timed out");
-    m_isDirty = true; //flag new device or re-init needed
-    Deinitialize();
+    if (g_advancedSettings.m_streamSilence)
+    {
+      m_isDirty = true; //flag new device or re-init needed
+      Deinitialize();
+      m_running = false;
+      return INT_MAX;
+    }
     m_running = false;
-    return INT_MAX;
+    return 0;
   }
 
   if (!m_running)

diff --git a/xbmc/cores/AudioEngine/Utils/AEBuffer.h b/xbmc/cores/AudioEngine/Utils/AEBuffer.h
@@ -134,9 +134,10 @@ class CAEBuffer
       memcpy(dst, m_buffer, size);
     // we can just reset m_bufferPos
     // if there is nothing else inside.
-    if (m_bufferPos != size)
+    if ((m_bufferPos != size) && size <= m_bufferPos)
       memmove(m_buffer, m_buffer + size, m_bufferSize - size);
-    m_bufferPos -= size;
+    if (size <= m_bufferPos)
+      m_bufferPos -= size;
   }
 
   /* cursor methods */