Changeset 73550 in vbox for trunk/src

Timestamp:

Aug 7, 2018 3:34:47 PM (6 years ago)

Author:

vboxsync

Message:

Audio/DrvHostDSound.cpp: Added a flag to indicate that an output stream is in "draining mode" and only transfer audio output data if we at least have data for a whole period (and not before).

File:

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

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

@@ -154 +154 @@
             /** Flag indicating whether playback was just (re)started. */
             bool                        fFirstTransfer;
+            /** Flag indicating whether this stream is in draining mode, e.g. no new
+             *  data is being written to it but DirectSound still needs to be able to
+             *  play its remaining (buffered) data. */
+            bool                        fDrain;
             /** How much (in bytes) the last transfer from the internal buffer
              *  to the DirectSound buffer was. */
@@ -851 +855 @@
     if (!pStreamDS->Dbg.tsLastTransferredMs)
         pStreamDS->Dbg.tsLastTransferredMs = RTTimeMilliTS();
-    Log3Func(("tsLastTransferredMs=%RU64ms, cbAvail=%RU32, cbFree=%RU32 -> cbToTransfer=%RU32\n",
-              RTTimeMilliTS() - pStreamDS->Dbg.tsLastTransferredMs, cbAvail, cbFree, cbToTransfer));
+    Log3Func(("tsLastTransferredMs=%RU64ms, cbAvail=%RU32, cbFree=%RU32 -> cbToTransfer=%RU32 (fDrain=%RTbool)\n",
+              RTTimeMilliTS() - pStreamDS->Dbg.tsLastTransferredMs, cbAvail, cbFree, cbToTransfer, pStreamDS->Out.fDrain));
     pStreamDS->Dbg.tsLastTransferredMs = RTTimeMilliTS();
 #endif
 
-#if 0
-    if (cbToTransfer > cbAvail) /* Paranoia. */
-        cbToTransfer = cbAvail;
-
-    if (cbToTransfer > cbFree)
-        cbToTransfer = cbFree;
-#endif
+    /* Only transfer anything if we have enough data for a DirectSound stream's period *and* are not
+     * in draining mode (already). */
+    if (   !pStreamDS->Out.fDrain
+        && cbToTransfer < DrvAudioHlpFramesToBytes(pStreamDS->Cfg.Backend.cfPeriod, &pStreamDS->Cfg.Props))
+        return VINF_SUCCESS;
 
     while (cbToTransfer)
@@ -1760 +1762 @@
     pStreamDS->Out.cbTransferred = 0;
     pStreamDS->Out.fFirstTransfer = true;
+    pStreamDS->Out.fDrain = false;
     pStreamDS->Out.cbLastTransferred = 0;
     pStreamDS->Out.tsLastTransferred = 0;
@@ -1811 +1814 @@
         {
             /* Make sure we transferred everything. */
+            pStreamDS->Out.fDrain = true;
             rc = dsoundPlayTransfer(pThis);
             if (   RT_SUCCESS(rc)