Changeset 57827 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Sep 18, 2015 12:53:31 PM (9 years ago)

Author:

vboxsync

Message:

Devices/Audio: actually consume samples in DrvHostNullAudio

File:

• trunk/src/VBox/Devices/Audio/DrvHostNullAudio.cpp (modified) (4 diffs)

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

@@ -57 +57 @@
     PDMAUDIOHSTSTRMOUT hw;
     uint64_t u64TicksLast;
+    uint64_t csPlayBuffer;
+    uint8_t *pu8PlayBuffer;
 } NULLAUDIOSTREAMOUT;
 
@@ -132 +134 @@
         NULLAUDIOSTREAMOUT *pNullStrmOut = (NULLAUDIOSTREAMOUT *)pHstStrmOut;
         pNullStrmOut->u64TicksLast = 0;
-        if (pcSamples)
-            *pcSamples = _1K;
+        pNullStrmOut->csPlayBuffer = _1K;
+        pNullStrmOut->pu8PlayBuffer = (uint8_t *)RTMemAlloc(_1K << pHstStrmOut->Props.cShift);
+        if (pNullStrmOut->pu8PlayBuffer)
+        {
+            if (pcSamples)
+                *pcSamples = pNullStrmOut->csPlayBuffer;
+        }
+        else
+        {
+            rc = VERR_NO_MEMORY;
+        }
     }
 
@@ -170 +181 @@
         cSamplesPlayed = csLive;
 
-    AudioMixBufFinish(&pHstStrmOut->MixBuf, cSamplesPlayed);
+    cSamplesPlayed = RT_MIN(cSamplesPlayed, pNullStrmOut->csPlayBuffer);
+
+    uint32_t csRead = 0;
+    AudioMixBufReadCirc(&pHstStrmOut->MixBuf, pNullStrmOut->pu8PlayBuffer, cSamplesPlayed << pHstStrmOut->Props.cShift, &csRead);
+    AudioMixBufFinish(&pHstStrmOut->MixBuf, csRead);
 
     if (pcSamplesPlayed)
-        *pcSamplesPlayed = cSamplesPlayed;
+        *pcSamplesPlayed = csRead;
 
     return VINF_SUCCESS;
@@ -215 +230 @@
 static DECLCALLBACK(int) drvHostNullAudioFiniOut(PPDMIHOSTAUDIO pInterface, PPDMAUDIOHSTSTRMOUT pHstStrmOut)
 {
+    NULLAUDIOSTREAMOUT *pNullStrmOut = (NULLAUDIOSTREAMOUT *)pHstStrmOut;
+    RTMemFree(pNullStrmOut->pu8PlayBuffer);
     return VINF_SUCCESS;
 }