Merge pull request #4852 from FernetMenta/aefixes
authorjmarshallnz <jcmarsha@gmail.com>
Sat, 7 Jun 2014 05:17:57 +0000 (17:17 +1200)
committerTrent Nelson <trent.nelson@pivosgroup.com>
Sat, 7 Jun 2014 06:00:33 +0000 (14:00 +0800)
ActiveAE: fix reset of buffering after 51ff5b6e39a752787547dbe79f6c58206...

xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp

index f8d7852..a3beda3 100644 (file)
@@ -1648,7 +1648,7 @@ bool CActiveAE::RunStages()
     {
       float buftime = (float)(*it)->m_inputBuffers->m_format.m_frames / (*it)->m_inputBuffers->m_format.m_sampleRate;
       time += buftime * (*it)->m_processingSamples.size();
-      while (time < MAX_CACHE_LEVEL && !(*it)->m_inputBuffers->m_freeSamples.empty())
+      while ((time < MAX_CACHE_LEVEL || (*it)->m_streamIsBuffering) && !(*it)->m_inputBuffers->m_freeSamples.empty())
       {
         buffer = (*it)->m_inputBuffers->GetFreeBuffer();
         (*it)->m_processingSamples.push_back(buffer);