Changeset 87270 in vbox

Timestamp:

Jan 15, 2021 1:06:46 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

142229

Message:

Audio/Mixer: Got rid of the stack-allocated scratch buffer when mixing / multiplexing stuff. Instead, each sink has a heap allocated one now, to avoid hammering the stack. ticketoem2ref:36

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixer.cpp (modified) (4 diffs)
• AudioMixer.h (modified) (1 diff)

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

@@ -847 +847 @@
         pSink->VolumeCombined.uLeft  = PDMAUDIO_VOLUME_MAX;
         pSink->VolumeCombined.uRight = PDMAUDIO_VOLUME_MAX;
+
+        const size_t cbScratchBuf = _1K; /** @todo Make this configurable? */
+
+        pSink->pabScratchBuf = (uint8_t *)RTMemAlloc(cbScratchBuf);
+        AssertPtrReturn(pSink->pabScratchBuf, VERR_NO_MEMORY);
+        pSink->cbScratchBuf  = cbScratchBuf;
     }
 
@@ -916 +922 @@
         RTStrFree(pSink->pszName);
         pSink->pszName = NULL;
+    }
+
+    if (pSink->pabScratchBuf)
+    {
+        Assert(pSink->cbScratchBuf);
+
+        RTMemFree(pSink->pabScratchBuf);
+        pSink->pabScratchBuf = NULL;
+
+        pSink->cbScratchBuf = 0;
     }
 
@@ -1675 +1691 @@
         return rc;
 
+    /* Sanity. */
+    AssertPtr(pSink->pabScratchBuf);
+    Assert(pSink->cbScratchBuf);
+
     /* Update each mixing sink stream's status. */
     PAUDMIXSTREAM pMixStream;
@@ -1689 +1709 @@
     uint32_t cbToWriteToStreams = AudioMixBufUsedBytes(&pSink->MixBuf);
 
-    uint8_t arrChunkBuf[_1K]; /** @todo Hm ... some zero copy / shared buffers would be nice! */
     while (cbToWriteToStreams)
     {
         uint32_t cfChunk;
-        rc  = AudioMixBufAcquireReadBlock(&pSink->MixBuf, arrChunkBuf, RT_MIN(cbToWriteToStreams, sizeof(arrChunkBuf)), &cfChunk);
+        rc  = AudioMixBufAcquireReadBlock(&pSink->MixBuf, pSink->pabScratchBuf, RT_MIN(cbToWriteToStreams, pSink->cbScratchBuf),
+                                          &cfChunk);
         if (RT_FAILURE(rc))
             break;
 
         const uint32_t cbChunk = DrvAudioHlpFramesToBytes(cfChunk, &pSink->PCMProps);
-        Assert(cbChunk <= sizeof(arrChunkBuf));
+        Assert(cbChunk <= pSink->cbScratchBuf);
 
         /* Multiplex the current chunk in a synchronized fashion to all connected streams. */
         uint32_t cbChunkWrittenMin = 0;
-        rc = audioMixerSinkMultiplexSync(pSink, AUDMIXOP_COPY, arrChunkBuf, cbChunk, &cbChunkWrittenMin);
+        rc = audioMixerSinkMultiplexSync(pSink, AUDMIXOP_COPY, pSink->pabScratchBuf, cbChunk, &cbChunkWrittenMin);
         if (RT_SUCCESS(rc))
         {

trunk/src/VBox/Devices/Audio/AudioMixer.h

@@ -194 +194 @@
      * a parent buffer for all streams this sink owns. */
     PDMAUDIOMIXBUF          MixBuf;
+    /** Scratch buffer for multiplexing / mixing. Might be NULL if not needed. */
+    uint8_t                *pabScratchBuf;
+    /** Size (in bytes) of pabScratchBuf. Might be 0 if not needed. */
+    size_t                  cbScratchBuf;
     /** Union for input/output specifics. */
     union