Changeset 89209 in vbox

Timestamp:

May 20, 2021 9:55:29 PM (4 years ago)

Author:

vboxsync

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

144550

Message:

DrvHostAudioCoreAudio: More logging around creation and destruction of streams. bugref:9890

File:

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

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

@@ -1513 +1513 @@
                 orc = AudioQueueNewInput(&pStreamCA->BasicStreamDesc, drvHostAudioCaInputQueueBufferCallback, pStreamCA,
                                          hRunLoop, hRunLoopMode, 0 /*fFlags - MBZ*/, &pStreamCA->hAudioQueue);
+            LogFlowFunc(("AudioQueueNew%s -> %#x\n", pCfgReq->enmDir == PDMAUDIODIR_OUT ? "Output" : "Input", orc));
             if (orc == noErr)
             {
@@ -1520 +1521 @@
                 UInt32 uSize = sizeof(pDev->UUID);
                 orc = AudioQueueSetProperty(pStreamCA->hAudioQueue, kAudioQueueProperty_CurrentDevice, &pDev->UUID, uSize);
+                LogFlowFunc(("AudioQueueSetProperty -> %#x\n", orc));
                 if (orc == noErr)
                 {
@@ -1565 +1567 @@
                         pStreamCA->cBuffers = cQueueBuffers;
 
+                        const size_t cbQueueBuffer = PDMAudioPropsFramesToBytes(&pStreamCA->Cfg.Props, cFramesQueueBuffer);
+                        LogFlowFunc(("Allocating %u, each %#x bytes / %u frames\n", cQueueBuffers, cbQueueBuffer, cFramesQueueBuffer));
                         cFramesBufferSize = 0;
-                        const size_t cbQueueBuffer = PDMAudioPropsFramesToBytes(&pStreamCA->Cfg.Props, cFramesQueueBuffer);
                         for (uint32_t iBuf = 0; iBuf < cQueueBuffers; iBuf++)
                         {
@@ -1644 +1647 @@
     PCOREAUDIOSTREAM pStreamCA = (PCOREAUDIOSTREAM)pStream;
     AssertPtrReturn(pStreamCA, VERR_INVALID_POINTER);
+    LogFunc(("%p: %s\n", pStreamCA, pStreamCA->Cfg.szName));
+#ifdef LOG_ENABLED
+    uint64_t const nsStart = RTTimeNanoTS();
+#endif
 
     /*
@@ -1673 +1680 @@
         /*
          * Free the queue buffers and the queue.
+         *
+         * This may take a while.  The AudioQueueReset call seems to helps
+         * reducing time stuck in AudioQueueDispose.
          */
 #ifdef CORE_AUDIO_WITH_BREAKPOINT_TIMER
@@ -1680 +1690 @@
         uint64_t nsStart = RTTimeNanoTS();
 #endif
+
+        /* Resetting the queue helps prevent AudioQueueDispose from taking a long time. */
+        if (pStreamCA->hAudioQueue)
+        {
+            LogFlowFunc(("Calling AudioQueueReset ...\n"));
+            orc = AudioQueueReset(pStreamCA->hAudioQueue);
+            LogFlowFunc(("AudioQueueReset -> %#x\n", orc));
+        }
 
         if (pStreamCA->paBuffers)
@@ -1724 +1742 @@
         LogFunc(("Wrong stream init state for %p: %d - leaking it\n", pStream, enmInitState));
 
-    LogFunc(("returns\n"));
+    LogFunc(("returns (took %'RU64 ns)\n", RTTimeNanoTS() - nsStart));
     return VINF_SUCCESS;
 }
@@ -1837 +1855 @@
     if (pStreamCA->fStarted)
     {
+#if 0
+        OSStatus orc2 = AudioQueueReset(pStreamCA->hAudioQueue);
+        LogFlowFunc(("AudioQueueReset(%s) returns %#x (%d)\n", pStreamCA->Cfg.szName, orc2, orc2)); RT_NOREF(orc2);
+        orc2 = AudioQueueFlush(pStreamCA->hAudioQueue);
+        LogFlowFunc(("AudioQueueFlush(%s) returns %#x (%d)\n", pStreamCA->Cfg.szName, orc2, orc2)); RT_NOREF(orc2);
+#endif
+
         OSStatus orc = AudioQueueStop(pStreamCA->hAudioQueue, TRUE /*inImmediate*/);
         LogFlowFunc(("AudioQueueStop(%s,TRUE) returns %#x (%d)\n", pStreamCA->Cfg.szName, orc, orc));