Changeset 61409 in vbox for trunk/src/VBox

Timestamp:

Jun 2, 2016 12:12:29 PM (9 years ago)

Author:

vboxsync

Message:

Audio/AudioMixBuffer.cpp: Better warning, logging.

File:

• trunk/src/VBox/Devices/Audio/AudioMixBuffer.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Audio/AudioMixBuffer.cpp

@@ -1734 +1734 @@
             *pcWritten = 0;
 
-        AUDMIXBUF_LOG(("%s: Parent buffer %s is full\n",
+        AUDMIXBUF_LOG(("%s: Parent buffer '%s' is full\n",
                        pMixBuf->pszName, pMixBuf->pParent->pszName));
 
@@ -1829 +1829 @@
     {
         pMixBuf->offWrite = (pMixBuf->offWrite + cWrittenTotal) % pMixBuf->cSamples;
-        pMixBuf->cUsed    = RT_MIN(pMixBuf->cUsed + cWrittenTotal,
-                                   pMixBuf->cSamples /* Max */);
-
-        uint32_t cProcessedTotal = pMixBuf->cUsed + cWrittenTotal;
-        if (cProcessedTotal > pMixBuf->cSamples)
+        pMixBuf->cUsed   += cWrittenTotal;
+
+        if (pMixBuf->cUsed > pMixBuf->cSamples)
         {
-            AUDMIXBUF_LOG(("Warning: %RU32 unprocessed samples overwritten\n", cProcessedTotal - pMixBuf->cSamples));
+            AUDMIXBUF_LOG(("Warning: %RU32 unprocessed samples overwritten\n", pMixBuf->cUsed - pMixBuf->cSamples));
             pMixBuf->cUsed = pMixBuf->cSamples;