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

Timestamp:

Jan 18, 2019 2:33:52 PM (6 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio: Only enter (pre-)buffering stage again on a buffer underrun if we actually configured (pre-)buffering.

File:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (modified) (1 diff)

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

@@ -1462 +1462 @@
                   DrvAudioHlpFramesToMilli(cfLive, &pStream->Host.Cfg.Props), uLivePercent, pStream->fThresholdReached));
 
-        /* Has the treshold been reached (e.g. are we in playing stage) and we now have no live samples to process? */
-        if (   pStream->fThresholdReached
-            && cfLive == 0)
-        {
-            LogRel2(("Audio: Buffer underrun for stream '%s' occurred (%RU64ms passed but only %RU64ms in buffer)\n",
-                     pStream->szName,
-                     DrvAudioHlpFramesToMilli(cfPassedReal, &pStream->Host.Cfg.Props),
-                     DrvAudioHlpFramesToMilli(cfLive, &pStream->Host.Cfg.Props)));
-
-            /* Enter buffering stage again. */
-            pStream->fThresholdReached = false;
+        if (   pStream->fThresholdReached         /* Has the treshold been reached (e.g. are we in playing stage) ... */
+            && cfLive == 0)                       /* ... and we now have no live samples to process? */
+        {
+            LogRel2(("Audio: Buffer underrun for stream '%s' occurred (%RU64ms passed)\n",
+                     pStream->szName, DrvAudioHlpFramesToMilli(cfPassedReal, &pStream->Host.Cfg.Props)));
+
+            if (pStream->Host.Cfg.Backend.cfPreBuf) /* Any pre-buffering configured? */
+            {
+                /* Enter pre-buffering stage again. */
+                pStream->fThresholdReached = false;
+            }
         }