Changeset 89184 in vbox for trunk/src/VBox

Timestamp:

May 19, 2021 8:58:09 PM (4 years ago)

Author:

vboxsync

Message:

Audio: Working on asynchronous stream creation, only there is a stupid stupid single lock approach in DrvAudio that significantly hampers the effect. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvAudio.cpp (modified) (3 diffs)
• DrvHostAudioCoreAudio.cpp (modified) (4 diffs)

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

@@ -2063 +2063 @@
 
 /**
+ * Asynchronous worker for drvAudioStreamDestroy.
+ *
+ * Does DISABLE and releases reference, possibly destroying the stream.
+ *
+ * @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)
+{
+    LogFlow(("pThis=%p pStreamEx=%p (%s)\n", pThis, pStreamEx, pStreamEx->Core.szName));
+
+    /** @todo r=bird: This isn't doing the trick for core audio, as the big
+     *        simple-minded critsect is held while the often very slow
+     *        AudioQueueDestroy call is made, blocking creation and manipulation
+     *        of new streams.  Sigh^3. */
+
+    /** @todo can we somehow drain it instead? */
+    int rc2 = drvAudioStreamControlInternal(pThis, pStreamEx, PDMAUDIOSTREAMCMD_DISABLE);
+    LogFlow(("DISABLE done: %Rrc\n", rc2));
+    AssertRC(rc2);
+
+    drvAudioStreamReleaseInternal(pThis, pStreamEx, true /*fMayDestroy*/);
+    LogFlow(("returning\n"));
+}
+
+
+/**
  * @interface_method_impl{PDMIAUDIOCONNECTOR,pfnStreamDestroy}
  */
@@ -2121 +2148 @@
             }
 
-            /* We don't really care about the status here as we'll release a reference regardless of the state. */
-            /** @todo can we somehow drain it instead? */
-            int rc2 = drvAudioStreamControlInternal(pThis, pStreamEx, PDMAUDIOSTREAMCMD_DISABLE);
-            AssertRC(rc2);
-
-            drvAudioStreamReleaseInternal(pThis, pStreamEx, true /*fMayDestroy*/);
+            /*
+             * Now, if the backend requests asynchronous disabling and destruction
+             * push the disabling and destroying over to a worker thread.
+             *
+             * This is a general offloading feature that all backends should make use of,
+             * however it's rather precarious on macs where stopping an already draining
+             * stream may take 8-10ms which naturally isn't something we should be doing
+             * on an EMT.
+             */
+            if (!(pThis->BackendCfg.fFlags & PDMAUDIOBACKEND_F_ASYNC_STREAM_DESTROY))
+                drvAudioStreamDestroyAsync(pThis, pStreamEx);
+            else
+            {
+                int rc2 = RTReqPoolCallEx(pThis->hReqPool, 0 /*cMillies*/, NULL /*phReq*/,
+                                          RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
+                                          (PFNRT)drvAudioStreamDestroyAsync, 2, pThis, pStreamEx);
+                LogFlowFunc(("hReqInitAsync=%p rc2=%Rrc\n", pStreamEx->hReqInitAsync, rc2));
+                AssertRCStmt(rc2, drvAudioStreamDestroyAsync(pThis, pStreamEx));
+            }
         }
         else
@@ -4387 +4427 @@
         && (   pIHostDrvAudio->pfnStreamInitAsync
             || pIHostDrvAudio->pfnDoOnWorkerThread
-            || (pThis->BackendCfg.fFlags & PDMAUDIOBACKEND_F_ASYNC_HINT) ))
+            || (pThis->BackendCfg.fFlags & (PDMAUDIOBACKEND_F_ASYNC_HINT | PDMAUDIOBACKEND_F_ASYNC_STREAM_DESTROY)) ))
     {
         char szName[16];

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

@@ -703 +703 @@
     RTStrCopy(pBackendCfg->szName, sizeof(pBackendCfg->szName), "Core Audio");
     pBackendCfg->cbStream       = sizeof(COREAUDIOSTREAM);
-    pBackendCfg->fFlags         = 0;
+    pBackendCfg->fFlags         = PDMAUDIOBACKEND_F_ASYNC_STREAM_DESTROY;
     /* For Core Audio we provide one stream per device for now. */
     pBackendCfg->cMaxStreamsIn  = PDMAudioHostEnumCountMatching(&pThis->Devices, PDMAUDIODIR_IN);
@@ -1637 +1637 @@
 
 /**
- * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamInitAsync}
- */
-static DECLCALLBACK(int) drvHostAudioCaHA_StreamInitAsync(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream, bool fDestroyed)
-{
-    RT_NOREF(pInterface, pStream, fDestroyed);
-    return VINF_SUCCESS;
-}
-
-
-/**
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
  */
@@ -1707 +1697 @@
         if (pStreamCA->hAudioQueue)
         {
-            LogFlowFunc(("Disposing of the queue ...\n", orc));
-            orc = AudioQueueDispose(pStreamCA->hAudioQueue, TRUE /*inImmediate/synchronously*/);
+            LogFlowFunc(("Disposing of the queue ...\n"));
+            orc = AudioQueueDispose(pStreamCA->hAudioQueue, TRUE /*inImmediate/synchronously*/); /* may take some time */
             LogFlowFunc(("AudioQueueDispose -> %#x (%d)\n", orc, orc));
             AssertMsg(orc == noErr, ("AudioQueueDispose -> orc=%#x\n", orc));
@@ -2643 +2633 @@
     pThis->IHostAudio.pfnStreamConfigHint           = NULL;
     pThis->IHostAudio.pfnStreamCreate               = drvHostAudioCaHA_StreamCreate;
-    pThis->IHostAudio.pfnStreamInitAsync            = drvHostAudioCaHA_StreamInitAsync;
+    pThis->IHostAudio.pfnStreamInitAsync            = NULL;
     pThis->IHostAudio.pfnStreamDestroy              = drvHostAudioCaHA_StreamDestroy;
     pThis->IHostAudio.pfnStreamNotifyDeviceChanged  = NULL;