Changeset 61187 in vbox for trunk/src/VBox

Timestamp:

May 25, 2016 8:42:18 AM (9 years ago)

Author:

vboxsync

Message:

Audio/AudioMixBuffer.cpp: Fixes for testcase.

File:

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

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

@@ -1741 +1741 @@
     }
 
+    PPDMAUDIOMIXBUF pParent = pMixBuf->pParent;
+
     AUDMIXBUF_LOG(("%s: enmFmt=%ld, pvBuf=%p, cbBuf=%RU32 (%RU32 samples)\n",
                    pMixBuf->pszName, enmFmt, pvBuf, cbBuf, AUDIOMIXBUF_B2S(pMixBuf, cbBuf)));
+
+    if (   pParent
+        && pParent->cSamples <= pMixBuf->cMixed)
+    {
+        if (pcWritten)
+            *pcWritten = 0;
+
+        AUDMIXBUF_LOG(("%s: Parent buffer %s is full\n",
+                       pMixBuf->pszName, pMixBuf->pParent->pszName));
+
+        return VINF_BUFFER_OVERFLOW;
+    }
 
     PPDMAUDMIXBUF_FN_CONVFROM pCnvFrm;
@@ -1793 +1807 @@
 #endif
 
-    uint32_t cWritten;
+    uint32_t cWrittenTotal = 0;
 
     PDMAUDMIXBUF_CONVOPTS convOpts;
@@ -1802 +1816 @@
     {
         convOpts.cSamples = cLenDst1;
-        cWritten = pCnvFrm(pSamplesDst1, pvBuf, cbBuf, &convOpts);
-        Assert(cWritten == cLenDst1);
+        cWrittenTotal = pCnvFrm(pSamplesDst1, pvBuf, cbBuf, &convOpts);
+        Assert(cWrittenTotal == cLenDst1);
 
 #ifdef AUDIOMIXBUF_DEBUG_DUMP_PCM_DATA
-        RTFileWrite(fh, pSamplesDst1, cWritten * sizeof(PDMAUDIOSAMPLE), NULL);
+        RTFileWrite(fh, pvBuf, cbBuf, NULL);
 #endif
     }
@@ -1817 +1831 @@
 
         convOpts.cSamples = cLenDst2;
-        cWritten = pCnvFrm(pSamplesDst2, (uint8_t *)pvBuf + AUDIOMIXBUF_S2B(pMixBuf, cLenDst1), cbBuf, &convOpts);
-        Assert(cWritten == cLenDst2);
+        cWrittenTotal += pCnvFrm(pSamplesDst2, (uint8_t *)pvBuf + AUDIOMIXBUF_S2B(pMixBuf, cLenDst1), cbBuf, &convOpts);
+        Assert(cWrittenTotal == (cLenDst1 + cLenDst2));
 
 #ifdef AUDIOMIXBUF_DEBUG_DUMP_PCM_DATA
-        RTFileWrite(fh, pSamplesDst2, cWritten * sizeof(PDMAUDIOSAMPLE), NULL);
+        RTFileWrite(fh, (uint8_t *)pvBuf + AUDIOMIXBUF_S2B(pMixBuf, cLenDst1), cbBuf, NULL);
 #endif
     }
@@ -1832 +1846 @@
     {
         pMixBuf->offReadWrite = cOffWrite % pMixBuf->cSamples;
+        pMixBuf->cProcessed   = RT_MIN(pMixBuf->cProcessed + cLenDst1 + cLenDst2,
+                                       pMixBuf->cSamples /* Max */);
 
         uint32_t cProcessedTotal = pMixBuf->cProcessed + cLenDst1 + cLenDst2;