fixed: the memcpy in PAPlayer::AddPacketsToStream definitely has to b…

…e a memmove fixed: PAPlayer would busy wait on the audio device when no data could be added
theuni · Feb 2, 2011 · 584ef84 · 584ef84
1 parent fbd3ec3
commit 584ef84
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/xbmc/cores/paplayer/PAPlayer.cpp b/xbmc/cores/paplayer/PAPlayer.cpp
@@ -999,8 +999,14 @@ bool PAPlayer::AddPacketsToStream(int stream, CAudioDecoder &dec)
     while (m_bufferPos[stream] >= (int)m_pAudioDecoder[stream]->GetChunkLen())
     {
       int rtn = m_pAudioDecoder[stream]->AddPackets(m_pcmBuffer[stream], m_bufferPos[stream]);
+      if (rtn == 0) //no pcm data added
+      {
+        Sleep(1);
+        continue;
+      }
+
       m_bufferPos[stream] -= rtn;
-      memcpy(m_pcmBuffer[stream], m_pcmBuffer[stream] + rtn, m_bufferPos[stream]);
+      memmove(m_pcmBuffer[stream], m_pcmBuffer[stream] + rtn, m_bufferPos[stream]);
     }
 
     // something done