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

Timestamp:

Sep 15, 2015 10:20:11 AM (9 years ago)

Author:

vboxsync

Message:

DrvHostDSound: start playback when first audio samples are copied to the sound buffer.

File:

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

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

@@ -65 +65 @@
     DWORD                cbPlayWritePos;
     DWORD                csPlaybackBufferSize;
-    bool                 fReinitPlayPos;
+    bool                 fRestartPlayback;
     PDMAUDIOSTREAMCFG    streamCfg;
 } DSOUNDSTREAMOUT, *PDSOUNDSTREAMOUT;
@@ -560 +560 @@
         LogFlowFunc(("Playback stopped\n"));
 
+        /* @todo Wait until all data in the buffer has been played. */
         HRESULT hr = IDirectSoundBuffer8_Stop(pDSoundStrmOut->pDSB);
         if (SUCCEEDED(hr))
@@ -590 +591 @@
                 dsoundPlayClearSamples(pDSoundStrmOut);
 
-                pDSoundStrmOut->fReinitPlayPos = true;
+                pDSoundStrmOut->fRestartPlayback = true;
 
                 LogFlowFunc(("Playback started\n"));
 
-                HRESULT hr = IDirectSoundBuffer8_Play(pDSoundStrmOut->pDSB, 0, 0, DSBPLAY_LOOPING);
-                if (FAILED(hr))
-                {
-                    LogRelMax(s_cMaxRelLogEntries, ("DSound: Error starting playback: %Rhrc\n", hr));
-                    rc = VERR_NOT_SUPPORTED;
-                }
+                /* The actual IDirectSoundBuffer8_Play call will be made in drvHostDSoundPlayOut,
+                 * because it is necessary to put some samples into the buffer first.
+                 */
             }
         }
@@ -1038 +1036 @@
         pDSoundStrmOut->pDSB = NULL;
         pDSoundStrmOut->cbPlayWritePos = 0;
-        pDSoundStrmOut->fReinitPlayPos = true;
+        pDSoundStrmOut->fRestartPlayback = true;
         pDSoundStrmOut->csPlaybackBufferSize = 0;
 
@@ -1126 +1124 @@
         DWORD cbBuffer = pDSoundStrmOut->csPlaybackBufferSize << cShift;
 
-        DWORD cbPlayPos, cbWritePos;
-        HRESULT hr = IDirectSoundBuffer8_GetCurrentPosition(pDSB, &cbPlayPos, &cbWritePos);
+        /* Get the current play position which is used for calculating the free space in the buffer. */
+        DWORD cbPlayPos;
+        HRESULT hr = IDirectSoundBuffer8_GetCurrentPosition(pDSB, &cbPlayPos, NULL);
         if (hr == DSERR_BUFFERLOST)
         {
@@ -1134 +1133 @@
                 break;
 
-            hr = IDirectSoundBuffer8_GetCurrentPosition(pDSB, &cbPlayPos, &cbWritePos);
+            hr = IDirectSoundBuffer8_GetCurrentPosition(pDSB, &cbPlayPos, NULL);
             if (hr == DSERR_BUFFERLOST) /* Avoid log flooding if the error is still there. */
                 break;
@@ -1145 +1144 @@
         }
 
-        DWORD cbFree;
-        DWORD cbPlayWritePos;
-        if (pDSoundStrmOut->fReinitPlayPos)
-        {
-            pDSoundStrmOut->fReinitPlayPos = false;
-
-            pDSoundStrmOut->cbPlayWritePos = cbWritePos;
-
-            cbPlayWritePos = pDSoundStrmOut->cbPlayWritePos;
-            cbFree = cbBuffer - dsoundRingDistance(cbWritePos, cbPlayPos, cbBuffer);
-        }
-        else
-        {
-            /* Full buffer? */
-            if (pDSoundStrmOut->cbPlayWritePos == cbPlayPos)
-                break;
-
-            cbPlayWritePos = pDSoundStrmOut->cbPlayWritePos;
-            cbFree         = dsoundRingDistance(cbPlayPos, cbPlayWritePos, cbBuffer);
-        }
+        DWORD cbFree = cbBuffer - dsoundRingDistance(pDSoundStrmOut->cbPlayWritePos, cbPlayPos, cbBuffer);
+
+        /* Check for full buffer, do not allow the cbPlayWritePos to catch cbPlayPos during playback,
+         * i.e. always leave a free space for 1 audio sample.
+         */
+        if (cbFree <= (1U << cShift))
+            break;
+        cbFree -= (1U << cShift);
 
         uint32_t csLive = drvAudioHstOutSamplesLive(pHstStrmOut);
@@ -1176 +1163 @@
         {
             LogFlowFunc(("cbLive=%RU32, cbBuffer=%ld, cbPlayWritePos=%ld, cbPlayPos=%ld\n",
-                         cbLive, cbBuffer, cbPlayWritePos, cbPlayPos));
+                         cbLive, cbBuffer, pDSoundStrmOut->cbPlayWritePos, cbPlayPos));
             break;
         }
@@ -1182 +1169 @@
         LPVOID pv1, pv2;
         DWORD cb1, cb2;
-        rc = dsoundLockOutput(pDSB, &pHstStrmOut->Props, cbPlayWritePos, cbLive,
+        rc = dsoundLockOutput(pDSB, &pHstStrmOut->Props, pDSoundStrmOut->cbPlayWritePos, cbLive,
                               &pv1, &pv2, &cb1, &cb2, 0 /* dwFlags */);
         if (RT_FAILURE(rc))
@@ -1210 +1197 @@
         dsoundUnlockOutput(pDSB, pv1, pv2, cb1, cb2);
 
-        pDSoundStrmOut->cbPlayWritePos = (cbPlayWritePos + (cReadTotal << cShift)) % cbBuffer;
-
-        LogFlowFunc(("%RU32 (%RU32 samples) out of %RU32%s, buffer write pos %ld -> %ld, rc=%Rrc\n",
+        pDSoundStrmOut->cbPlayWritePos = (pDSoundStrmOut->cbPlayWritePos + (cReadTotal << cShift)) % cbBuffer;
+
+        LogFlowFunc(("%RU32 (%RU32 samples) out of %RU32%s, buffer write pos %ld, rc=%Rrc\n",
                      AUDIOMIXBUF_S2B(&pHstStrmOut->MixBuf, cReadTotal), cReadTotal, cbLive,
                      cbLive != AUDIOMIXBUF_S2B(&pHstStrmOut->MixBuf, cReadTotal) ? " !!!": "",
-                     cbPlayWritePos, pDSoundStrmOut->cbPlayWritePos, rc));
+                     pDSoundStrmOut->cbPlayWritePos, rc));
 
         if (cReadTotal)
@@ -1223 +1210 @@
         }
 
+        if (pDSoundStrmOut->fRestartPlayback)
+        {
+            /* The playback has been just started.
+             * Some samples of the new sound have been copied to the buffer
+             * and it can start playing.
+             */
+            pDSoundStrmOut->fRestartPlayback = false;
+            HRESULT hr = IDirectSoundBuffer8_Play(pDSoundStrmOut->pDSB, 0, 0, DSBPLAY_LOOPING);
+            if (FAILED(hr))
+            {
+                LogRelMax(s_cMaxRelLogEntries, ("DSound: Error starting playback: %Rhrc\n", hr));
+                rc = VERR_NOT_SUPPORTED;
+            }
+        }
     } while (0);
 
@@ -1239 +1240 @@
 
     pDSoundStrmOut->cbPlayWritePos = 0;
-    pDSoundStrmOut->fReinitPlayPos = true;
+    pDSoundStrmOut->fRestartPlayback = true;
     pDSoundStrmOut->csPlaybackBufferSize = 0;
     RT_ZERO(pDSoundStrmOut->streamCfg);