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

Timestamp:

Jan 20, 2016 2:56:07 PM (9 years ago)

Author:

vboxsync

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

105143

Message:

Audio/DrvHostDSound.cpp:

• Only stop playing if were able to retrieve the stream's status before.
• Use DSBCAPS_LOCSOFTWARE for our secondary Direct Sound buffer for treating it as a static buffer.
• Extended (release) logging.

File:

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

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

@@ -538 +538 @@
         DSBUFFERDESC bd;
         RT_ZERO(bd);
-        bd.dwSize = sizeof(bd);
+        bd.dwSize      = sizeof(bd);
         bd.lpwfxFormat = &wfx;
-        bd.dwFlags = DSBCAPS_GLOBALFOCUS | DSBCAPS_GETCURRENTPOSITION2;
+
+        /*
+         * As we reuse our (secondary) buffer for playing out data as it comes in,
+         * we're using this buffer as a so-called static buffer.
+         *
+         * However, as we do not want to use memory on the sound device directly
+         * (as most modern audio hardware on the host doesn't have this anyway),
+         * we're *not* going to use DSBCAPS_STATIC for that.
+         *
+         * Instead we're specifying DSBCAPS_LOCSOFTWARE, as this fits the bill
+         * of copying own buffer data (from AudioMixBuf) to our secondary's Direct Sound buffer.
+         */
+        bd.dwFlags     = DSBCAPS_GLOBALFOCUS | DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_LOCSOFTWARE;
 #ifdef VBOX_WITH_AUDIO_CALLBACKS
-        bd.dwFlags      |= DSBCAPS_CTRLPOSITIONNOTIFY;
+        bd.dwFlags    |= DSBCAPS_CTRLPOSITIONNOTIFY;
 #endif
         bd.dwBufferBytes = pThis->cfg.cbBufferOut;
@@ -584 +596 @@
         DSLOG(("DSound: Playback format:\n"
                "  dwBufferBytes   = %RI32\n"
+               "  dwFlags         = 0x%x\n"
                "  wFormatTag      = %RI16\n"
                "  nChannels       = %RI16\n"
@@ -592 +605 @@
                "  cbSize          = %RI16\n",
                bc.dwBufferBytes,
+               bc.dwFlags,
                wfx.wFormatTag,
                wfx.nChannels,
@@ -742 +756 @@
     {
         /* This performs some restore, so call it anyway and ignore result. */
-        directSoundPlayGetStatus(pDSoundStrmOut->pDSB, NULL /* Status */);
-
-        DSLOG(("DSound: Stopping playback\n"));
-
-        /** @todo Wait until all data in the buffer has been played. */
-        hr = IDirectSoundBuffer8_Stop(pDSoundStrmOut->pDSB);
+        hr = directSoundPlayGetStatus(pDSoundStrmOut->pDSB, NULL /* pdwStatus */);
         if (SUCCEEDED(hr))
-            dsoundPlayClearSamples(pDSoundStrmOut);
-        else
-            DSLOGREL(("DSound: Stopping playback failed with %Rhrc\n", hr));
+        {
+            DSLOG(("DSound: Stopping playback\n"));
+
+            /** @todo Wait until all data in the buffer has been played. */
+            hr = IDirectSoundBuffer8_Stop(pDSoundStrmOut->pDSB);
+            if (SUCCEEDED(hr))
+                dsoundPlayClearSamples(pDSoundStrmOut);
+        }
     }
     else
         hr = E_UNEXPECTED;
+
+    if (FAILED(hr))
+        DSLOGREL(("DSound: Stopping playback failed with %Rhrc\n", hr));
 
     return hr;
@@ -790 +807 @@
     else
         hr = E_UNEXPECTED;
+
+    if (FAILED(hr))
+        DSLOGREL(("DSound: Starting playback failed with %Rhrc\n", hr));
 
     return hr;
@@ -1007 +1027 @@
         DSLOG(("DSound: Capture format:\n"
                "  dwBufferBytes   = %RI32\n"
+               "  dwFlags         = 0x%x\n"
                "  wFormatTag      = %RI16\n"
                "  nChannels       = %RI16\n"
@@ -1015 +1036 @@
                "  cbSize          = %RI16\n",
                bc.dwBufferBytes,
+               bc.dwFlags,
                wfx.wFormatTag,
                wfx.nChannels,
@@ -1363 +1385 @@
         DWORD cb1, cb2;
         HRESULT hr = directSoundPlayLock(pDSB, &pHstStrmOut->Props, pDSoundStrmOut->cbPlayWritePos, cbLive,
-                                 &pv1, &pv2, &cb1, &cb2, 0 /* dwFlags */);
+                                         &pv1, &pv2, &cb1, &cb2, 0 /* dwFlags */);
         if (FAILED(hr))
         {