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

Timestamp:

Oct 8, 2020 11:23:03 AM (4 years ago)

Author:

vboxsync

Message:

Devices/Audio: Re-initialize the stream in drvAudioStreamGetStatus() when scheduled or it will never be initialized due to the audio mixer skipping everything when the returned status doesn't indicate a ready stream, ticketref:18594, bugref:8658 comment 11

File:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (modified) (4 diffs)

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

@@ -817 +817 @@
         if (RT_SUCCESS(rc))
         {
-            rc = drvAudioStreamCreateInternalBackend(pThis, pStream, &pStream->Host.Cfg, NULL /* pCfgAcq */);
+            PDMAUDIOSTREAMCFG CfgHostAcq;
+            rc = drvAudioStreamCreateInternalBackend(pThis, pStream, &pStream->Host.Cfg, &CfgHostAcq);
             /** @todo Validate (re-)acquired configuration with pStream->Host.Cfg? */
+            if (RT_SUCCESS(rc))
+            {
+#ifdef LOG_ENABLED
+                LogFunc(("[%s] Acquired host format:\n",  pStream->szName));
+                DrvAudioHlpStreamCfgPrint(&CfgHostAcq);
+#endif
+            }
         }
     }
@@ -1113 +1121 @@
 
 /**
+ * Re-initializes the given stream if it is scheduled for this operation.
+ *
+ * @returns VBox status code.
+ * @param   pThis               Pointer to driver instance.
+ * @param   pStream             Stream to check and maybe re-initialize.
+ */
+static int drvAudioStreamMaybeReInit(PDRVAUDIO pThis, PPDMAUDIOSTREAM pStream)
+{
+    int rc = VINF_SUCCESS;
+
+    if (pStream->fStatus & PDMAUDIOSTREAMSTS_FLAGS_PENDING_REINIT)
+    {
+#ifdef VBOX_WITH_AUDIO_ENUM
+        if (pThis->fEnumerateDevices)
+        {
+            /* Re-enumerate all host devices. */
+            drvAudioDevicesEnumerateInternal(pThis, true /* fLog */, NULL /* pDevEnum */);
+
+            pThis->fEnumerateDevices = false;
+        }
+#endif /* VBOX_WITH_AUDIO_ENUM */
+
+        /* Remove the pending re-init flag in any case, regardless whether the actual re-initialization succeeded
+         * or not. If it failed, the backend needs to notify us again to try again at some later point in time. */
+        pStream->fStatus &= ~PDMAUDIOSTREAMSTS_FLAGS_PENDING_REINIT;
+        rc = drvAudioStreamReInitInternal(pThis, pStream);
+    }
+
+    return rc;
+}
+
+/**
  * Does one iteration of an audio stream.
  * This function gives the backend the chance of iterating / altering data and
@@ -1131 +1171 @@
         return VINF_SUCCESS;
 
-    int rc;
-
     /* Is the stream scheduled for re-initialization? Do so now. */
-    if (pStream->fStatus & PDMAUDIOSTREAMSTS_FLAGS_PENDING_REINIT)
-    {
-#ifdef VBOX_WITH_AUDIO_ENUM
-        if (pThis->fEnumerateDevices)
-        {
-            /* Re-enumerate all host devices. */
-            drvAudioDevicesEnumerateInternal(pThis, true /* fLog */, NULL /* pDevEnum */);
-
-            pThis->fEnumerateDevices = false;
-        }
-#endif /* VBOX_WITH_AUDIO_ENUM */
-
-        /* Remove the pending re-init flag in any case, regardless whether the actual re-initialization succeeded
-         * or not. If it failed, the backend needs to notify us again to try again at some later point in time. */
-        pStream->fStatus &= ~PDMAUDIOSTREAMSTS_FLAGS_PENDING_REINIT;
-
-        rc = drvAudioStreamReInitInternal(pThis, pStream);
-        if (RT_FAILURE(rc))
-            return rc;
-    }
+    int rc = drvAudioStreamMaybeReInit(pThis, pStream);
+    if (RT_FAILURE(rc))
+        return rc;
 
 #ifdef LOG_ENABLED
@@ -2893 +2914 @@
     int rc2 = RTCritSectEnter(&pThis->CritSect);
     AssertRC(rc2);
+
+    /* Is the stream scheduled for re-initialization? Do so now. */
+    int rc = drvAudioStreamMaybeReInit(pThis, pStream);
+    if (RT_FAILURE(rc)) /** @todo r=aeichner What is the correct operation in the failure case? */
+        LogRel(("Audio: Reinitializing the stream in drvAudioStreamGetStatus() failed with %Rrc\n", rc));
 
     PDMAUDIOSTREAMSTS fStrmStatus = pStream->fStatus;