Changeset 89213 in vbox for trunk/src/VBox/Devices

Timestamp:

May 21, 2021 10:00:12 AM (4 years ago)

Author:

vboxsync

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

144554

Message:

Audio: Added an fImmediate indicator to the pfnStreamDestroy methods so the backend knows whether it's okay to continue draining the stream or if it must be destroyed without delay. The latter is typically only for shutdown and driver plumbing. This helps quite a bit for HDA/CoreAudio/knoppix. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixer.cpp (modified) (7 diffs)
• AudioMixer.h (modified) (1 diff)
• DevHda.cpp (modified) (10 diffs)
• DevHdaCodec.cpp (modified) (2 diffs)
• DevHdaCodec.h (modified) (2 diffs)
• DevIchAc97.cpp (modified) (5 diffs)
• DevSB16.cpp (modified) (4 diffs)
• DrvAudio.cpp (modified) (8 diffs)
• DrvHostAudioAlsa.cpp (modified) (1 diff)
• DrvHostAudioCoreAudio.cpp (modified) (5 diffs)
• DrvHostAudioDSound.cpp (modified) (2 diffs)
• DrvHostAudioDebug.cpp (modified) (1 diff)
• DrvHostAudioNull.cpp (modified) (1 diff)
• DrvHostAudioOss.cpp (modified) (1 diff)
• DrvHostAudioPulseAudio.cpp (modified) (1 diff)
• DrvHostAudioValidationKit.cpp (modified) (1 diff)
• DrvHostAudioWasApi.cpp (modified) (2 diffs)

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

@@ -112 +112 @@
 
 static int audioMixerStreamCtlInternal(PAUDMIXSTREAM pMixStream, PDMAUDIOSTREAMCMD enmCmd);
-static void audioMixerStreamDestroyInternal(PAUDMIXSTREAM pStream, PPDMDEVINS pDevIns);
+static void audioMixerStreamDestroyInternal(PAUDMIXSTREAM pStream, PPDMDEVINS pDevIns, bool fImmediate);
 static int audioMixerStreamUpdateStatus(PAUDMIXSTREAM pMixStream);
 
@@ -663 +663 @@
                     }
 
-                    rc = pConn->pfnStreamDestroy(pConn, pStream);
+                    rc = pConn->pfnStreamDestroy(pConn, pStream, true /*fImmediate*/);
                 }
 
@@ -1000 +1000 @@
     {
         audioMixerSinkRemoveStreamInternal(pSink, pStream);
-        audioMixerStreamDestroyInternal(pStream, pDevIns); /* (Unlike the other two, this frees the stream structure.) */
+        audioMixerStreamDestroyInternal(pStream, pDevIns, true /*fImmediate*/); /* (Unlike the other two, this frees the stream structure.) */
     }
 
@@ -2735 +2735 @@
  * @param   pMixStream  Mixer stream to destroy.
  * @param   pDevIns     The device instance the statistics are registered with.
- */
-static void audioMixerStreamDestroyInternal(PAUDMIXSTREAM pMixStream, PPDMDEVINS pDevIns)
+ * @param   fImmediate  How to handle still draining streams, whether to let
+ *                      them complete (@c false) or destroy them immediately (@c
+ *                      true).
+ */
+static void audioMixerStreamDestroyInternal(PAUDMIXSTREAM pMixStream, PPDMDEVINS pDevIns, bool fImmediate)
 {
     AssertPtrReturnVoid(pMixStream);
@@ -2748 +2751 @@
         {
             pMixStream->pConn->pfnStreamRelease(pMixStream->pConn, pMixStream->pStream);
-            pMixStream->pConn->pfnStreamDestroy(pMixStream->pConn, pMixStream->pStream);
+            pMixStream->pConn->pfnStreamDestroy(pMixStream->pConn, pMixStream->pStream, fImmediate);
 
             pMixStream->pStream = NULL;
@@ -2776 +2779 @@
  * Destroys a mixer stream.
  *
- * @param   pMixStream      Mixer stream to destroy.
- * @param   pDevIns         The device instance statistics are registered with.
- */
-void AudioMixerStreamDestroy(PAUDMIXSTREAM pMixStream, PPDMDEVINS pDevIns)
+ * @param   pMixStream  Mixer stream to destroy.
+ * @param   pDevIns     The device instance statistics are registered with.
+ * @param   fImmediate  How to handle still draining streams, whether to let
+ *                      them complete (@c false) or destroy them immediately (@c
+ *                      true).
+ */
+void AudioMixerStreamDestroy(PAUDMIXSTREAM pMixStream, PPDMDEVINS pDevIns, bool fImmediate)
 {
     if (!pMixStream)
@@ -2811 +2817 @@
     if (RT_SUCCESS(rc2))
     {
-        audioMixerStreamDestroyInternal(pMixStream, pDevIns);
+        audioMixerStreamDestroyInternal(pMixStream, pDevIns, fImmediate);
         pMixStream = NULL;
     }

trunk/src/VBox/Devices/Audio/AudioMixer.h

@@ -324 +324 @@
 int         AudioMixerSinkUnlock(PAUDMIXSINK pSink);
 
-void AudioMixerStreamDestroy(PAUDMIXSTREAM pStream, PPDMDEVINS pDevIns);
+void AudioMixerStreamDestroy(PAUDMIXSTREAM pStream, PPDMDEVINS pDevIns, bool fImmediate);
 
 #endif /* !VBOX_INCLUDED_SRC_Audio_AudioMixer_h */

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

@@ -1786 +1786 @@
  * Removes an audio stream from the device setup using the given configuration.
  *
+ * Used by hdaRegWriteSDCTL().
+ *
  * @returns VBox status code.
  * @param   pThisCC             The ring-3 HDA device state.
@@ -1845 +1847 @@
         && enmMixerCtl != PDMAUDIOMIXERCTL_UNKNOWN)
     {
-        rc = hdaR3CodecRemoveStream(pThisCC->pCodec, enmMixerCtl);
+        rc = hdaR3CodecRemoveStream(pThisCC->pCodec, enmMixerCtl, false /*fImmediate*/);
     }
 
@@ -2214 +2216 @@
 
         AudioMixerSinkRemoveStream(pThisCC->SinkLineIn.pMixSink, pDrv->LineIn.pMixStrm);
-        AudioMixerStreamDestroy(pDrv->LineIn.pMixStrm, pDevIns);
+        AudioMixerStreamDestroy(pDrv->LineIn.pMixStrm, pDevIns, true /*fImmediate*/);
         pDrv->LineIn.pMixStrm = NULL;
     }
@@ -2225 +2227 @@
 
         AudioMixerSinkRemoveStream(pThisCC->SinkMicIn.pMixSink, pDrv->MicIn.pMixStrm);
-        AudioMixerStreamDestroy(pDrv->MicIn.pMixStrm, pDevIns);
+        AudioMixerStreamDestroy(pDrv->MicIn.pMixStrm, pDevIns, true /*fImmediate*/);
         pDrv->MicIn.pMixStrm = NULL;
     }
@@ -2233 +2235 @@
     {
         AudioMixerSinkRemoveStream(pThisCC->SinkFront.pMixSink, pDrv->Front.pMixStrm);
-        AudioMixerStreamDestroy(pDrv->Front.pMixStrm, pDevIns);
+        AudioMixerStreamDestroy(pDrv->Front.pMixStrm, pDevIns, true /*fImmediate*/);
         pDrv->Front.pMixStrm = NULL;
     }
@@ -2241 +2243 @@
     {
         AudioMixerSinkRemoveStream(pThisCC->SinkCenterLFE.pMixSink, pDrv->CenterLFE.pMixStrm);
-        AudioMixerStreamDestroy(pDrv->CenterLFE.pMixStrm, pDevIns);
+        AudioMixerStreamDestroy(pDrv->CenterLFE.pMixStrm, pDevIns, true /*fImmediate*/);
         pDrv->CenterLFE.pMixStrm = NULL;
     }
@@ -2248 +2250 @@
     {
         AudioMixerSinkRemoveStream(pThisCC->SinkRear.pMixSink, pDrv->Rear.pMixStrm);
-        AudioMixerStreamDestroy(pDrv->Rear.pMixStrm, pDevIns);
+        AudioMixerStreamDestroy(pDrv->Rear.pMixStrm, pDevIns, true /*fImmediate*/);
         pDrv->Rear.pMixStrm = NULL;
     }
@@ -2367 +2369 @@
         }
         if (RT_FAILURE(rc))
-            AudioMixerStreamDestroy(pMixStrm, pDevIns);
+            AudioMixerStreamDestroy(pMixStrm, pDevIns, true /*fImmediate*/);
     }
 
@@ -2440 +2442 @@
  * @interface_method_impl{HDACODECR3,pfnCbMixerRemoveStream}
  */
-static DECLCALLBACK(int) hdaR3MixerRemoveStream(PPDMDEVINS pDevIns, PDMAUDIOMIXERCTL enmMixerCtl)
+static DECLCALLBACK(int) hdaR3MixerRemoveStream(PPDMDEVINS pDevIns, PDMAUDIOMIXERCTL enmMixerCtl, bool fImmediate)
 {
     PHDASTATER3 pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PHDASTATER3);
@@ -2492 +2494 @@
             {
                 AudioMixerSinkRemoveStream(pSink->pMixSink, pMixStream);
-                AudioMixerStreamDestroy(pMixStream, pDevIns);
+                AudioMixerStreamDestroy(pMixStream, pDevIns, fImmediate);
 
                 pMixStream = NULL;

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

@@ -2471 +2471 @@
 }
 
-int hdaR3CodecRemoveStream(PHDACODECR3 pThisCC, PDMAUDIOMIXERCTL enmMixerCtl)
+int hdaR3CodecRemoveStream(PHDACODECR3 pThisCC, PDMAUDIOMIXERCTL enmMixerCtl, bool fImmediate)
 {
     AssertPtrReturn(pThisCC, VERR_INVALID_POINTER);
 
-    int rc = pThisCC->pfnCbMixerRemoveStream(pThisCC->pDevIns, enmMixerCtl);
+    int rc = pThisCC->pfnCbMixerRemoveStream(pThisCC->pDevIns, enmMixerCtl, fImmediate);
 
     LogFlowFuncLeaveRC(rc);
@@ -2572 +2572 @@
     LogRel2(("HDA: Powering off codec ...\n"));
 
-    int rc2 = hdaR3CodecRemoveStream(pThisCC, PDMAUDIOMIXERCTL_FRONT);
+    int rc2 = hdaR3CodecRemoveStream(pThisCC, PDMAUDIOMIXERCTL_FRONT, true /*fImmediate*/);
     AssertRC(rc2);
 #ifdef VBOX_WITH_AUDIO_HDA_51_SURROUND
-    rc2 = hdaR3CodecRemoveStream(pThisCC, PDMAUDIOMIXERCTL_CENTER_LFE);
+    rc2 = hdaR3CodecRemoveStream(pThisCC, PDMAUDIOMIXERCTL_CENTER_LFE, true /*fImmediate*/);
     AssertRC(rc2);
-    rc2 = hdaR3CodecRemoveStream(pThisCC, PDMAUDIOMIXERCTL_REAR);
+    rc2 = hdaR3CodecRemoveStream(pThisCC, PDMAUDIOMIXERCTL_REAR, true /*fImmediate*/);
     AssertRC(rc2);
 #endif
 
 #ifdef VBOX_WITH_AUDIO_HDA_MIC_IN
-    rc2 = hdaR3CodecRemoveStream(pThisCC, PDMAUDIOMIXERCTL_MIC_IN);
+    rc2 = hdaR3CodecRemoveStream(pThisCC, PDMAUDIOMIXERCTL_MIC_IN, true /*fImmediate*/);
     AssertRC(rc2);
 #endif
-    rc2 = hdaR3CodecRemoveStream(pThisCC, PDMAUDIOMIXERCTL_LINE_IN);
+    rc2 = hdaR3CodecRemoveStream(pThisCC, PDMAUDIOMIXERCTL_LINE_IN, true /*fImmediate*/);
     AssertRC(rc2);
 }

trunk/src/VBox/Devices/Audio/DevHdaCodec.h

@@ -923 +923 @@
      * @param   pDevIns             The device instance.
      * @param   enmMixerCtl         Mixer control to remove.
+     * @param   fImmediate          Whether the backend should be allowed to
+     *                              finished draining (@c false) or if it must be
+     *                              destroyed immediately (@c true).
      */
-    DECLR3CALLBACKMEMBER(int,  pfnCbMixerRemoveStream, (PPDMDEVINS pDevIns, PDMAUDIOMIXERCTL enmMixerCtl));
+    DECLR3CALLBACKMEMBER(int,  pfnCbMixerRemoveStream, (PPDMDEVINS pDevIns, PDMAUDIOMIXERCTL enmMixerCtl, bool fImmediate));
     /**
      * Controls an input / output converter widget, that is, which converter is
@@ -952 +955 @@
 int hdaR3CodecLoadState(PPDMDEVINS pDevIns, PHDACODEC pThis, PHDACODECR3 pThisCC, PSSMHANDLE pSSM, uint32_t uVersion);
 int hdaR3CodecAddStream(PHDACODECR3 pThisCC, PDMAUDIOMIXERCTL enmMixerCtl, PPDMAUDIOSTREAMCFG pCfg);
-int hdaR3CodecRemoveStream(PHDACODECR3 pThisCC, PDMAUDIOMIXERCTL enmMixerCtl);
+int hdaR3CodecRemoveStream(PHDACODECR3 pThisCC, PDMAUDIOMIXERCTL enmMixerCtl, bool fImmediate);
 
 int hdaCodecSaveState(PPDMDEVINS pDevIns, PHDACODEC pThis, PSSMHANDLE pSSM);

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

@@ -1547 +1547 @@
             }
             if (RT_FAILURE(rc))
-                AudioMixerStreamDestroy(pMixStrm, pDevIns);
+                AudioMixerStreamDestroy(pMixStrm, pDevIns, true /*fImmediate*/);
         }
 
@@ -1648 +1648 @@
 
         AudioMixerSinkRemoveStream(pThisCC->pSinkMicIn,  pDrv->MicIn.pMixStrm);
-        AudioMixerStreamDestroy(pDrv->MicIn.pMixStrm, pDevIns);
+        AudioMixerStreamDestroy(pDrv->MicIn.pMixStrm, pDevIns, true /*fImmediate*/);
         pDrv->MicIn.pMixStrm = NULL;
     }
@@ -1658 +1658 @@
 
         AudioMixerSinkRemoveStream(pThisCC->pSinkLineIn, pDrv->LineIn.pMixStrm);
-        AudioMixerStreamDestroy(pDrv->LineIn.pMixStrm, pDevIns);
+        AudioMixerStreamDestroy(pDrv->LineIn.pMixStrm, pDevIns, true /*fImmediate*/);
         pDrv->LineIn.pMixStrm = NULL;
     }
@@ -1665 +1665 @@
     {
         AudioMixerSinkRemoveStream(pThisCC->pSinkOut,    pDrv->Out.pMixStrm);
-        AudioMixerStreamDestroy(pDrv->Out.pMixStrm, pDevIns);
+        AudioMixerStreamDestroy(pDrv->Out.pMixStrm, pDevIns, true /*fImmediate*/);
         pDrv->Out.pMixStrm = NULL;
     }
@@ -1691 +1691 @@
             AudioMixerSinkRemoveStream(pMixSink, pDrvStream->pMixStrm);
 
-            AudioMixerStreamDestroy(pDrvStream->pMixStrm, pDevIns);
+            AudioMixerStreamDestroy(pDrvStream->pMixStrm, pDevIns, false /*fImmediate*/);
             pDrvStream->pMixStrm = NULL;
         }

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

@@ -1815 +1815 @@
                 pDrvStream->pMixStrm = pMixStrm;
             else
-                AudioMixerStreamDestroy(pMixStrm, pDevIns);
+                AudioMixerStreamDestroy(pMixStrm, pDevIns, true /*fImmediate*/);
         }
     }
@@ -1883 +1883 @@
             AudioMixerSinkRemoveStream(pMixSink, pDrvStream->pMixStrm);
 
-            AudioMixerStreamDestroy(pDrvStream->pMixStrm, pDevIns);
+            AudioMixerStreamDestroy(pDrvStream->pMixStrm, pDevIns, false /*fImmediate*/);
             pDrvStream->pMixStrm = NULL;
         }
@@ -1905 +1905 @@
     PSB16DRIVER pDrv;
     RTListForEach(&pThis->lstDrv, pDrv, SB16DRIVER, Node)
+    {
         sb16RemoveDrvStream(pDevIns, pMixSink, enmDir, dstSrc, pDrv);
+    }
 }
 
@@ -1953 +1955 @@
     {
         AudioMixerSinkRemoveStream(pThis->pSinkOut, pDrv->Out.pMixStrm);
-        AudioMixerStreamDestroy(pDrv->Out.pMixStrm, pDevIns);
+        AudioMixerStreamDestroy(pDrv->Out.pMixStrm, pDevIns, true /*fImmediate*/);
         pDrv->Out.pMixStrm = NULL;
     }

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

@@ -170 +170 @@
     /** Set if pfnStreamCreate returned VINF_AUDIO_STREAM_ASYNC_INIT_NEEDED. */
     bool                    fNeedAsyncInit;
-    bool                    afPadding[2];
+    /** The fImmediate parameter value for pfnStreamDestroy. */
+    bool                    fDestroyImmediate;
+    bool                    fPadding;
 
     /** Number of (re-)tries while re-initializing the stream. */
@@ -1803 +1805 @@
             {
                 PPDMAUDIOBACKENDSTREAM pBackend = (PPDMAUDIOBACKENDSTREAM)(pStreamEx + 1);
-                pBackend->uMagic            = PDMAUDIOBACKENDSTREAM_MAGIC;
-                pBackend->pStream           = &pStreamEx->Core;
-
-                pStreamEx->pBackend         = pBackend;
-                pStreamEx->Core.enmDir      = pCfgHost->enmDir;
-                pStreamEx->Core.cbBackend   = (uint32_t)cbHstStrm;
-                pStreamEx->fNoMixBufs       = RT_BOOL(fFlags & PDMAUDIOSTREAM_CREATE_F_NO_MIXBUF);
-                pStreamEx->hReqInitAsync    = NIL_RTREQ;
-                pStreamEx->uMagic           = DRVAUDIOSTREAM_MAGIC;
+                pBackend->uMagic                = PDMAUDIOBACKENDSTREAM_MAGIC;
+                pBackend->pStream               = &pStreamEx->Core;
+
+                pStreamEx->pBackend             = pBackend;
+                pStreamEx->Core.enmDir          = pCfgHost->enmDir;
+                pStreamEx->Core.cbBackend       = (uint32_t)cbHstStrm;
+                pStreamEx->fNoMixBufs           = RT_BOOL(fFlags & PDMAUDIOSTREAM_CREATE_F_NO_MIXBUF);
+                pStreamEx->fDestroyImmediate    = true;
+                pStreamEx->hReqInitAsync        = NIL_RTREQ;
+                pStreamEx->uMagic               = DRVAUDIOSTREAM_MAGIC;
 
                 /* Make a unqiue stream name including the host (backend) driver name. */
@@ -1971 +1974 @@
         RTCritSectRwEnterShared(&pThis->CritSectHotPlug); /** @todo needed? */
         if (pThis->pHostDrvAudio)
-            rc = pThis->pHostDrvAudio->pfnStreamDestroy(pThis->pHostDrvAudio, pStreamEx->pBackend);
+            rc = pThis->pHostDrvAudio->pfnStreamDestroy(pThis->pHostDrvAudio, pStreamEx->pBackend, pStreamEx->fDestroyImmediate);
         RTCritSectRwLeaveShared(&pThis->CritSectHotPlug);
 
@@ -2004 +2007 @@
      * ...
      */
-    int rc = drvAudioStreamControlInternal(pThis, pStreamEx, PDMAUDIOSTREAMCMD_DISABLE);
-    if (RT_SUCCESS(rc))
-        rc = drvAudioStreamDestroyInternalBackend(pThis, pStreamEx);
+    if (pStreamEx->fDestroyImmediate)
+        drvAudioStreamControlInternal(pThis, pStreamEx, PDMAUDIOSTREAMCMD_DISABLE);
+    int rc = drvAudioStreamDestroyInternalBackend(pThis, pStreamEx);
 
     /* Destroy mixing buffers. */
@@ -2137 +2140 @@
  * @param   pThis       Pointer to the DrvAudio instance data.
  * @param   pStreamEx   The stream.  One reference for us to release.
- */
-static DECLCALLBACK(void) drvAudioStreamDestroyAsync(PDRVAUDIO pThis, PDRVAUDIOSTREAM pStreamEx)
-{
-    LogFlowFunc(("pThis=%p pStreamEx=%p (%s)\n", pThis, pStreamEx, pStreamEx->Core.szName));
+ * @param   fImmediate  How to treat draining streams.
+ */
+static DECLCALLBACK(void) drvAudioStreamDestroyAsync(PDRVAUDIO pThis, PDRVAUDIOSTREAM pStreamEx, bool fImmediate)
+{
+    LogFlowFunc(("pThis=%p pStreamEx=%p (%s) fImmediate=%RTbool\n", pThis, pStreamEx, pStreamEx->Core.szName, fImmediate));
 #ifdef LOG_ENABLED
     uint64_t const nsStart = RTTimeNanoTS();
 #endif
-
     RTCritSectEnter(&pStreamEx->Core.CritSect);
 
-    /** @todo can we somehow drain it instead?
-     * Would need to know if the destroying is happening at runtime or when powering
-     * off the VM, as we don't care for draining the latter case. */
-    int rc2 = drvAudioStreamControlInternal(pThis, pStreamEx, PDMAUDIOSTREAMCMD_DISABLE);
-    LogFlowFunc(("DISABLE done: %Rrc\n", rc2));
-    AssertRC(rc2);
+    pStreamEx->fDestroyImmediate = fImmediate; /* Do NOT adjust for draining status, just pass it as-is. CoreAudio needs this. */
+
+    if (!fImmediate && (pStreamEx->fStatus & PDMAUDIOSTREAM_STS_PENDING_DISABLE))
+        LogFlowFunc(("No DISABLE\n"));
+    else
+    {
+        int rc2 = drvAudioStreamControlInternal(pThis, pStreamEx, PDMAUDIOSTREAMCMD_DISABLE);
+        LogFlowFunc(("DISABLE done: %Rrc\n", rc2));
+        AssertRC(rc2);
+    }
 
     RTCritSectLeave(&pStreamEx->Core.CritSect);
@@ -2165 +2172 @@
  * @interface_method_impl{PDMIAUDIOCONNECTOR,pfnStreamDestroy}
  */
-static DECLCALLBACK(int) drvAudioStreamDestroy(PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(int) drvAudioStreamDestroy(PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream, bool fImmediate)
 {
     PDRVAUDIO pThis = RT_FROM_MEMBER(pInterface, DRVAUDIO, IAudioConnector);
@@ -2176 +2183 @@
     PDRVAUDIOSTREAM pStreamEx = (PDRVAUDIOSTREAM)pStream;   /* Note! Do not touch pStream after this! */
     AssertPtrReturn(pStreamEx, VERR_INVALID_POINTER);
-    LogFlowFunc(("ENTER - %p %s\n", pStreamEx, pStreamEx->Core.szName));
+    LogFlowFunc(("ENTER - %p (%s) fImmediate=%RTbool\n", pStreamEx, pStreamEx->Core.szName, fImmediate));
     AssertReturn(pStreamEx->Core.uMagic == PDMAUDIOSTREAM_MAGIC, VERR_INVALID_MAGIC);
     AssertReturn(pStreamEx->uMagic == DRVAUDIOSTREAM_MAGIC, VERR_INVALID_MAGIC);
@@ -2233 +2240 @@
              */
             if (!(pThis->BackendCfg.fFlags & PDMAUDIOBACKEND_F_ASYNC_STREAM_DESTROY))
-                drvAudioStreamDestroyAsync(pThis, pStreamEx);
+                drvAudioStreamDestroyAsync(pThis, pStreamEx, fImmediate);
             else
             {
                 int rc2 = RTReqPoolCallEx(pThis->hReqPool, 0 /*cMillies*/, NULL /*phReq*/,
                                           RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
-                                          (PFNRT)drvAudioStreamDestroyAsync, 2, pThis, pStreamEx);
+                                          (PFNRT)drvAudioStreamDestroyAsync, 3, pThis, pStreamEx, fImmediate);
                 LogFlowFunc(("hReqInitAsync=%p rc2=%Rrc\n", pStreamEx->hReqInitAsync, rc2));
-                AssertRCStmt(rc2, drvAudioStreamDestroyAsync(pThis, pStreamEx));
+                AssertRCStmt(rc2, drvAudioStreamDestroyAsync(pThis, pStreamEx, fImmediate));
             }
         }

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

@@ -789 +789 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
  */
-static DECLCALLBACK(int) drvHostAlsaAudioHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(int) drvHostAlsaAudioHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                          bool fImmediate)
 {
     RT_NOREF(pInterface);
     PALSAAUDIOSTREAM pStreamALSA = (PALSAAUDIOSTREAM)pStream;
     AssertPtrReturn(pStreamALSA, VERR_INVALID_POINTER);
+    RT_NOREF(fImmediate);
 
     /** @todo r=bird: It's not like we can do much with a bad status... Check

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

@@ -1642 +1642 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
  */
-static DECLCALLBACK(int) drvHostAudioCaHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(int) drvHostAudioCaHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                        bool fImmediate)
 {
     RT_NOREF(pInterface);
     PCOREAUDIOSTREAM pStreamCA = (PCOREAUDIOSTREAM)pStream;
     AssertPtrReturn(pStreamCA, VERR_INVALID_POINTER);
-    LogFunc(("%p: %s\n", pStreamCA, pStreamCA->Cfg.szName));
+    LogFunc(("%p: %s fImmediate=%RTbool\n", pStreamCA, pStreamCA->Cfg.szName, fImmediate));
 #ifdef LOG_ENABLED
     uint64_t const nsStart = RTTimeNanoTS();
@@ -1668 +1669 @@
         if (pStreamCA->hAudioQueue)
         {
-            orc = AudioQueueStop(pStreamCA->hAudioQueue, TRUE /*inImmediate/synchronously*/);
+            orc = AudioQueueStop(pStreamCA->hAudioQueue, fImmediate ? TRUE : FALSE /*inImmediate/synchronously*/);
             LogFlowFunc(("AudioQueueStop -> %#x\n", orc));
         }
@@ -1691 +1692 @@
 #endif
 
-        /* Resetting the queue helps prevent AudioQueueDispose from taking a long time. */
-        if (pStreamCA->hAudioQueue)
+#if 0 /* This seems to work even when doing a non-immediate stop&dispose. However, it doesn't make sense conceptually. */
+        if (pStreamCA->hAudioQueue /*&& fImmediate*/)
         {
             LogFlowFunc(("Calling AudioQueueReset ...\n"));
@@ -1698 +1699 @@
             LogFlowFunc(("AudioQueueReset -> %#x\n", orc));
         }
-
-        if (pStreamCA->paBuffers)
+#endif
+
+        if (pStreamCA->paBuffers && fImmediate)
         {
             LogFlowFunc(("Freeing %u buffers ...\n", pStreamCA->cBuffers));
@@ -1708 +1710 @@
                 pStreamCA->paBuffers[iBuf].pBuf = NULL;
             }
-            RTMemFree(pStreamCA->paBuffers);
-            pStreamCA->paBuffers = NULL;
-        }
-        pStreamCA->cBuffers = 0;
+        }
 
         if (pStreamCA->hAudioQueue)
         {
             LogFlowFunc(("Disposing of the queue ...\n"));
-            orc = AudioQueueDispose(pStreamCA->hAudioQueue, TRUE /*inImmediate/synchronously*/); /* may take some time */
+            orc = AudioQueueDispose(pStreamCA->hAudioQueue, fImmediate ? TRUE : FALSE /*inImmediate/synchronously*/); /* may take some time */
             LogFlowFunc(("AudioQueueDispose -> %#x (%d)\n", orc, orc));
             AssertMsg(orc == noErr, ("AudioQueueDispose -> orc=%#x\n", orc));
             pStreamCA->hAudioQueue = NULL;
         }
+
+        /* We should get no further buffer callbacks at this point according to the docs. */
+        if (pStreamCA->paBuffers)
+        {
+            RTMemFree(pStreamCA->paBuffers);
+            pStreamCA->paBuffers = NULL;
+        }
+        pStreamCA->cBuffers = 0;
 
 #ifdef CORE_AUDIO_WITH_BREAKPOINT_TIMER

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

@@ -1723 +1723 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
  */
-static DECLCALLBACK(int) drvHostDSoundHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(int) drvHostDSoundHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                       bool fImmediate)
 {
     PDRVHOSTDSOUND pThis     = RT_FROM_MEMBER(pInterface, DRVHOSTDSOUND, IHostAudio);
@@ -1729 +1730 @@
     AssertPtrReturn(pStreamDS, VERR_INVALID_POINTER);
     LogFlowFunc(("Stream '%s' {%s}\n", pStreamDS->Cfg.szName, drvHostDSoundStreamStatusString(pStreamDS)));
+    RT_NOREF(fImmediate);
 
     RTCritSectEnter(&pThis->CritSect);

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

@@ -132 +132 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
  */
-static DECLCALLBACK(int) drvHostDebugAudioHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
-{
-    RT_NOREF(pInterface);
+static DECLCALLBACK(int) drvHostDebugAudioHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                           bool fImmediate)
+{
+    RT_NOREF(pInterface, fImmediate);
     PDEBUGAUDIOSTREAM pStreamDbg = (PDEBUGAUDIOSTREAM)pStream;
     AssertPtrReturn(pStreamDbg, VERR_INVALID_POINTER);

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

@@ -99 +99 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
  */
-static DECLCALLBACK(int) drvHostNullAudioHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
-{
-    RT_NOREF(pInterface, pStream);
+static DECLCALLBACK(int) drvHostNullAudioHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                          bool fImmediate)
+{
+    RT_NOREF(pInterface, pStream, fImmediate);
     return VINF_SUCCESS;
 }

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

@@ -430 +430 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
  */
-static DECLCALLBACK(int) drvHostOssAudioHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
-{
-    RT_NOREF(pInterface);
+static DECLCALLBACK(int) drvHostOssAudioHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                         bool fImmediate)
+{
+    RT_NOREF(pInterface, fImmediate);
     POSSAUDIOSTREAM pStreamOSS = (POSSAUDIOSTREAM)pStream;
     AssertPtrReturn(pStreamOSS, VERR_INVALID_POINTER);

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

@@ -1161 +1161 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
  */
-static DECLCALLBACK(int) drvHostAudioPaHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(int) drvHostAudioPaHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                        bool fImmediate)
 {
     PDRVHOSTPULSEAUDIO pThis     = RT_FROM_MEMBER(pInterface, DRVHOSTPULSEAUDIO, IHostAudio);
     PPULSEAUDIOSTREAM  pStreamPA = (PPULSEAUDIOSTREAM)pStream;
     AssertPtrReturn(pStreamPA, VERR_INVALID_POINTER);
+    RT_NOREF(fImmediate);
 
     if (pStreamPA->pStream)

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

@@ -220 +220 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
  */
-static DECLCALLBACK(int) drvHostValKitAudioHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
-{
-    RT_NOREF(pInterface); //PDRVHOSTVAKITAUDIO pThis     = RT_FROM_MEMBER(pInterface, DRVHOSTVAKITAUDIO, IHostAudio);
+static DECLCALLBACK(int) drvHostValKitAudioHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                            bool fImmediate)
+{
+    RT_NOREF(pInterface, fImmediate);
     PVAKITAUDIOSTREAM  pStreamDbg = (PVAKITAUDIOSTREAM)pStream;
     AssertPtrReturn(pStreamDbg, VERR_INVALID_POINTER);

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

@@ -1921 +1921 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
  */
-static DECLCALLBACK(int) drvHostAudioWasHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(int) drvHostAudioWasHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                         bool fImmediate)
 {
     PDRVHOSTAUDIOWAS        pThis      = RT_FROM_MEMBER(pInterface, DRVHOSTAUDIOWAS, IHostAudio);
@@ -1927 +1928 @@
     AssertPtrReturn(pStreamWas, VERR_INVALID_POINTER);
     LogFlowFunc(("Stream '%s'\n", pStreamWas->Cfg.szName));
+    RT_NOREF(fImmediate);
     HRESULT hrc;