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

Timestamp:

Feb 12, 2018 3:18:01 PM (7 years ago)

Author:

vboxsync

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

120819

Message:

Audio/DrvHostDSound.cpp: Fixed playback start latency and made some estimates about when actually stopping a (streaming) output buffer.

File:

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

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

@@ -152 +152 @@
             /** Total amount (in bytes) written. */
             uint64_t                    cbWritten;
+            /** Total amount (in bytes) played (to the DirectSound buffer). */
+            uint64_t                    cbPlayed;
             /** Flag indicating whether playback was (re)started. */
             bool                        fFirstPlayback;
@@ -680 +682 @@
         bd.dwFlags    |= DSBCAPS_CTRLPOSITIONNOTIFY;
 
-        bd.dwBufferBytes = DrvAudioHlpCalcBitrate(&pCfgReq->Props) / 8;
+        bd.dwBufferBytes = DrvAudioHlpMsToBytes(&pCfgReq->Props, pThis->Cfg.msLatencyOut);
 
         DSLOG(("DSound: Playback buffer is %ld bytes\n", bd.dwBufferBytes));
@@ -756 +758 @@
         RTCritSectEnter(&pThis->CritSect);
 
-        rc = RTCircBufCreate(&pStreamDS->pCircBuf, pStreamDS->cbBufSize);
+        rc = RTCircBufCreate(&pStreamDS->pCircBuf, pStreamDS->cbBufSize * 2 /* Double buffering */);
         AssertRC(rc);
 
@@ -778 +780 @@
             dsPosNotify[2].hEventNotify = pThis->aEvents[DSOUNDEVENT_OUTPUT];
 
-            hr = IDirectSoundNotify_SetNotificationPositions(pNotify, 3 /* Count */, dsPosNotify);
+            hr = IDirectSoundNotify_SetNotificationPositions(pNotify, RT_ELEMENTS(dsPosNotify), dsPosNotify);
             if (FAILED(hr))
                 DSLOGREL(("DSound: Setting playback position notification failed with %Rhrc\n", hr));
@@ -1122 +1124 @@
         bd.dwSize        = sizeof(bd);
         bd.lpwfxFormat   = &wfx;
-        bd.dwBufferBytes = DrvAudioHlpCalcBitrate(&pCfgReq->Props) / 8;
+        bd.dwBufferBytes = DrvAudioHlpMsToBytes(&pCfgReq->Props, pThis->Cfg.msLatencyIn);
 
         DSLOG(("DSound: Capture buffer is %ld bytes\n", bd.dwBufferBytes));
@@ -1204 +1206 @@
         pStreamDS->cbBufSize     = bc.dwBufferBytes;
 
-        rc = RTCircBufCreate(&pStreamDS->pCircBuf, pStreamDS->cbBufSize);
+        rc = RTCircBufCreate(&pStreamDS->pCircBuf, pStreamDS->cbBufSize * 2 /* Double buffering */);
         AssertRC(rc);
 
@@ -1544 +1546 @@
     pStreamDS->Out.offPlayCursorLastPending = 0;
     pStreamDS->Out.cbWritten = 0;
+    pStreamDS->Out.cbPlayed = 0;
     pStreamDS->Out.fFirstPlayback = true;
     pStreamDS->Out.tsLastPlayMs = 0;
@@ -1656 +1659 @@
     Assert(cbWrittenTotal <= cxBuf);
 
+    pStreamDS->Out.cbWritten += cbWrittenTotal;
+
     if (   pStreamDS->Out.fFirstPlayback
-        && RTCircBufUsed(pCircBuf))
+        && pStreamDS->Out.cbWritten >= pStreamDS->cbBufSize)
     {
         BOOL fRc = SetEvent(pThis->aEvents[DSOUNDEVENT_OUTPUT]);
         RT_NOREF(fRc);
         Assert(fRc);
-
-//        Log3Func(("cxBuf=%RU32, cbWrittenTotal=%RU32, %RU64ms\n", cxBuf, cbWrittenTotal, tsNow - s_lastplayed));
     }
 
@@ -2030 +2033 @@
                     HRESULT hr;
 
+                    DWORD offPlayCursor, offWriteCursor;
+                    hr = IDirectSoundBuffer8_GetCurrentPosition(pDSB, &offPlayCursor, &offWriteCursor);
+                    if (FAILED(hr))
+                        break;
+
                     DWORD cbFree, cbRemaining;
                     if (pStreamDS->Out.fFirstPlayback)
                     {
-                        DWORD offWriteCursor;
-                        hr = IDirectSoundBuffer8_GetCurrentPosition(pDSB, NULL, &offWriteCursor);
-                        if (FAILED(hr))
-                            break;
-
-                        pStreamDS->Out.offWritePos = offWriteCursor;
-
-                        cbFree      = pStreamDS->cbBufSize;
-                        cbRemaining = pStreamDS->cbBufSize;
+                        cbRemaining = 0;
+                        cbFree      = dsoundRingDistance(pStreamDS->Out.offWritePos, 0, pStreamDS->cbBufSize);
                     }
                     else
                     {
-                        DWORD offPlayCursor;
-                        hr = IDirectSoundBuffer8_GetCurrentPosition(pDSB, &offPlayCursor, NULL);
-                        if (FAILED(hr))
-                            break;
-
                         cbFree      = dsoundRingDistance(offPlayCursor, pStreamDS->Out.offWritePos, pStreamDS->cbBufSize);
                         cbRemaining = dsoundRingDistance(pStreamDS->Out.offWritePos, offPlayCursor, pStreamDS->cbBufSize);
@@ -2058 +2054 @@
 
                     DWORD cbUsed   = (uint32_t)RTCircBufUsed(pCircBuf);
+                    DWORD cbToPlay = RT_MIN(cbFree, cbUsed);
+
                     if (   !cbUsed
-                        || pStreamDS->Out.cUnderruns < 32) /** @todo Make this configurable. */
+                        && pStreamDS->Out.cbWritten
+                        && pStreamDS->Out.cUnderruns < 32) /** @todo Make this configurable. */
                     {
-                        DSLOG(("DSound: Warning: No more playback data available within time (%RU32 bytes free)\n", cbFree));
+                        //DSLOG(("DSound: Warning: No more playback data available within time (%RU32 bytes free)\n", cbFree));
+                        Log3Func(("Underrun (cbFree=%ld, cbRemaining=%ld, cbUsed=%ld, cbToPlay=%ld, offPlay=%ld, offWrite=%ld)\n",
+                                  cbFree, cbRemaining, cbUsed, cbToPlay, offPlayCursor, offWriteCursor));
                         pStreamDS->Out.cUnderruns++;
                     }
-
-                    DWORD cbToPlay = RT_MIN(cbFree, cbUsed);
-
-                    Log3Func(("cbUsed=%ld, cbToPlay=%ld\n", cbUsed, cbToPlay));
 
                     while (cbToPlay)
@@ -2099 +2096 @@
                             cbToPlay -= (uint32_t)cbBuf;
 
-                            pStreamDS->Out.cbWritten += cb1 + cb2;
+                            pStreamDS->Out.cbPlayed += cb1 + cb2;
                         }
 
@@ -2105 +2102 @@
                     }
 
-                    if (pStreamDS->Out.fFirstPlayback)
+                    if (   pStreamDS->Out.fFirstPlayback
+                        && RTCircBufUsed(pCircBuf) >= pStreamDS->cbBufSize)
                     {
                         DWORD fFlags = DSCBSTART_LOOPING;
@@ -2125 +2123 @@
                         {
                             DSLOG(("DSound: Started playing output\n"));
-                            pStreamDS->Out.fFirstPlayback   = false;
+                            pStreamDS->Out.fFirstPlayback = false;
                         }
                     }
@@ -2131 +2129 @@
                     {
                         if (   !RTCircBufUsed(pCircBuf)
-                            && !cbRemaining)
+                            && pStreamDS->Out.cbPlayed == pStreamDS->Out.cbWritten)
                         {
+                            Assert(pStreamDS->Out.cbPlayed == pStreamDS->Out.cbWritten);
+
+                            Log3Func(("Stopping (cbFree=%ld, cbRemaining=%ld, cbUsed=%ld, cbToPlay=%ld, offPlay=%ld, offWrite=%ld)\n",
+                                      cbFree, cbRemaining, cbUsed, cbToPlay, offPlayCursor, offWriteCursor));
+
+                            /* As we're using a streaming buffer and DirectSound apparently has no clean way of figuring out
+                             * when such a buffer was played back fully, we need to make a guess ourselves:
+                             *
+                             * See if there's any data left between the play and write cursors and calculate some rough estimate
+                             * how long we have to wait before actually stopping the buffer.
+                             *
+                             * Sleeping here is fine, as we're running in a (dedicated) thread anyway. */
+                            const DWORD cbRemaining = dsoundRingDistance(offWriteCursor, offPlayCursor, pStreamDS->cbBufSize);
+                            uint64_t msWait = cbRemaining / DrvAudioHlpMsToBytes(&pStreamDS->pCfg->Props, 1 /* ms */);
+
+                            if (msWait)
+                            {
+                                Log3Func(("Waiting %RU64ms (%ld bytes)\n", msWait, cbRemaining));
+                                RTThreadSleep(msWait);
+                            }
+
                             DSLOG(("DSound: Stopping playing output\n"));
                             hr = IDirectSoundBuffer8_Stop(pDSB);
@@ -2309 +2328 @@
     {
         pStreamDS->pCfg = DrvAudioHlpStreamCfgDup(pCfgAcq);
-        if (!pStreamDS->pCfg)
+        if (pStreamDS->pCfg)
+        {
+            rc = RTCritSectInit(&pStreamDS->CritSect);
+        }
+        else
             rc = VERR_NO_MEMORY;
     }
@@ -2338 +2361 @@
     if (RT_SUCCESS(rc))
     {
+        rc = RTCritSectDelete(&pStreamDS->CritSect);
+
         DrvAudioHlpStreamCfgFree(pStreamDS->pCfg);
         pStreamDS->pCfg = NULL;
@@ -2430 +2455 @@
                 pStreamDS->Out.tsLastPlayMs = tsNowMs;
 
+            PDRVHOSTDSOUND pThis = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
+
             const uint64_t diffLastPlayMs = tsNowMs - pStreamDS->Out.tsLastPlayMs;
-            const uint64_t msThreshold    = 100;
+            const uint64_t msThreshold    = pThis->Cfg.msLatencyOut;
 
             Log3Func(("diffLastPlayMs=%RU64ms\n", diffLastPlayMs));
@@ -2437 +2464 @@
             cbPending = (diffLastPlayMs >= msThreshold) ? 0 : 1;
 
-            //if (!cbPending)
-            //    directSoundPlayStop(pThis, pStreamDS, false /* fFlush */);
+            pStreamDS->Out.tsLastPlayMs = tsNowMs;
         }