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

Timestamp:

Aug 14, 2018 6:55:18 PM (6 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio: Made sure that we don't do pre-buffer to the full buffer size by default, as this would lead to a buffer overflow too quickly. Instead, pre-buffer two full periods and also added a sanity check for this.

File:

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

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

@@ -2961 +2961 @@
     }
     else /* Set default pre-buffering size. */
-        pCfgReq->Backend.cfPreBuf = pCfgReq->Backend.cfBufferSize;
+        pCfgReq->Backend.cfPreBuf = pCfgReq->Backend.cfPeriod * 2;
 
     LogRel2(("Audio: Using %s pre-buffering size (%RU64ms, %RU32 frames) for stream '%s'\n",
@@ -2981 +2981 @@
         && pCfgReq->Backend.cfPreBuf)
     {
-        if (pCfgReq->Backend.cfBufferSize < pCfgReq->Backend.cfPreBuf)
-        {
-            LogRel(("Audio: Error for stream '%s': Pre-buffering size (%RU64ms) must not be bigger than the buffer size (%RU64ms)\n",
+        if (pCfgReq->Backend.cfBufferSize <= pCfgReq->Backend.cfPreBuf)
+        {
+            LogRel(("Audio: Error for stream '%s': Buffering size (%RU64ms) must not be smaller as or equal to the pre-buffering size (%RU64ms)\n",
                     pStream->szName, DrvAudioHlpFramesToMilli(pCfgReq->Backend.cfPreBuf, &pCfgReq->Props),
                     DrvAudioHlpFramesToMilli(pCfgReq->Backend.cfBufferSize, &pCfgReq->Props)));