XBMC Media Center

Revision: 9292
          http://svn.sourceforge.net/xbmc/?rev=9292&view=rev
Author:   elupus
Date:     2007-06-12 11:44:32 -0700 (Tue, 12 Jun 2007)

Log Message:
-----------
fixed: dvdplayer wouldn't take locally buffered data into account when calculating audio delay

Modified Paths:
--------------
    trunk/XBMC/xbmc/cores/dvdplayer/DVDAudio.cpp

Modified: trunk/XBMC/xbmc/cores/dvdplayer/DVDAudio.cpp
===================================================================
--- trunk/XBMC/xbmc/cores/dvdplayer/DVDAudio.cpp	2007-06-12 18:18:11 UTC (rev 9291)
+++ trunk/XBMC/xbmc/cores/dvdplayer/DVDAudio.cpp	2007-06-12 18:44:32 UTC (rev 9292)
@@ -35,12 +35,14 @@
 
 void CDVDAudio::RegisterAudioCallback(IAudioCallback* pCallback)
 {
+  CSingleLock lock (m_critSection);
   m_pCallback = pCallback;
   if (m_pCallback && m_pAudioDecoder) m_pAudioDecoder->RegisterAudioCallback(pCallback);
 }
 
 void CDVDAudio::UnRegisterAudioCallback()
 {
+  CSingleLock lock (m_critSection);
   m_pCallback = NULL;
   if (m_pAudioDecoder) m_pAudioDecoder->UnRegisterAudioCallback();
 }
@@ -127,21 +129,13 @@
     
 }
 
-// we have a little bug here.
-// if resampling is enabled and sscc.cpp is upsampling, m_pAudioDecoder->GetChunkLen() will return the incorrect
-// chunklenght. In combination with the code below thiswill result in dropped data.
 DWORD CDVDAudio::AddPackets(unsigned char* data, DWORD len)
 {
   if (!m_pAudioDecoder)
-  {
-    m_iBufferSize = 0;
     return -1;
-  }
+
   int iTotalSize = len;
 
-  while (m_pAudioDecoder->GetSpace() < m_dwPacketSize && !m_bStop)
-    Sleep(1);
-
   if (m_iBufferSize > 0)
   {
     unsigned int iBytesToCopy = m_dwPacketSize - m_iBufferSize;
@@ -219,8 +213,18 @@
 }
 
 __int64 CDVDAudio::GetDelay()
-{  
-  return (__int64)(m_pAudioDecoder->GetDelay() * DVD_TIME_BASE);
+{
+  CSingleLock lock (m_critSection);
+
+  double delay = 0.0;
+  if(m_pAudioDecoder)
+    delay = m_pAudioDecoder->GetDelay();
+
+  DWORD bps = m_iChannels * m_iBitrate * m_iBitsPerSample>>3;
+  if(m_iBufferSize && bps)
+    delay += (double)m_iBufferSize / bps;
+
+  return (__int64)(delay * DVD_TIME_BASE);
 }
 
 void CDVDAudio::Flush()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12582
          http://xbmc.svn.sourceforge.net/xbmc/?rev=12582&view=rev
Author:   elupus
Date:     2008-04-08 12:58:42 -0700 (Tue, 08 Apr 2008)

Log Message:
-----------
cosmetic: avoid logging error "More bytes left than can be stored in buffer" when dvdplayer ends.
cosmetic: make CDVDAudio::AddPackets return correct value if it is forced to use temp buffer

Modified Paths:
--------------
    trunk/XBMC/xbmc/cores/dvdplayer/DVDAudio.cpp

Modified: trunk/XBMC/xbmc/cores/dvdplayer/DVDAudio.cpp
===================================================================
--- trunk/XBMC/xbmc/cores/dvdplayer/DVDAudio.cpp	2008-04-08 18:02:31 UTC (rev 12581)
+++ trunk/XBMC/xbmc/cores/dvdplayer/DVDAudio.cpp	2008-04-08 19:58:42 UTC (rev 12582)
@@ -188,17 +188,16 @@
   len -= copied;
 
   // if we have more data left, save it for the next call to this funtion
-  if (len > 0)
+  if (len > 0 && !m_bStop)
   {
     CSingleLock lock (m_critSection);
     if(len > m_dwPacketSize)
       CLog::Log(LOGERROR, "%s - More bytes left than can be stored in buffer", __FUNCTION__);
 
-    if(m_pBuffer)
-    {
-      m_iBufferSize = min(len, m_dwPacketSize);
-      memcpy(m_pBuffer, data, m_iBufferSize);
-    }
+    m_iBufferSize = min(len, m_dwPacketSize);
+    memcpy(m_pBuffer, data, m_iBufferSize);
+    len  -= m_iBufferSize;
+    data += m_iBufferSize;
   }
   return total - len;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.