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

Timestamp:

Dec 13, 2019 1:54:24 PM (5 years ago)

Author:

vboxsync

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

135459

Message:

Audio: Make sure to only set a new recording source if the backend in question is ready for it; otherwise stay with current settings. bugref:9625.

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixer.cpp (modified) (6 diffs)
• DrvAudio.cpp (modified) (3 diffs)

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

@@ -523 +523 @@
     {
         rc = audioMixerStreamCtlInternal(pStream, PDMAUDIOSTREAMCMD_ENABLE, AUDMIXSTRMCTL_F_NONE);
+        if (rc == VERR_AUDIO_STREAM_NOT_READY)
+            rc = VINF_SUCCESS; /* Not fatal here, stream can become available at some later point in time. */
     }
 
@@ -576 +578 @@
         return VERR_NO_MEMORY;
 
-    pMixStream->pszName = RTStrDup(pCfg->szName);
+    PDMAUDIOBACKENDCFG BackendCfg;
+    int rc = pConn->pfnGetConfig(pConn, &BackendCfg);
+    if (RT_FAILURE(rc))
+    {
+        RTMemFree(pMixStream);
+        return rc;
+    }
+
+    /* Assign the backend's name to the mixer stream's name for easier identification in the (release) log. */
+    pMixStream->pszName = RTStrAPrintf2("[%s] %s", pCfg->szName, BackendCfg.szName);
     if (!pMixStream->pszName)
     {
@@ -583 +594 @@
     }
 
-    int rc = RTCritSectEnter(&pSink->CritSect);
+    rc = RTCritSectEnter(&pSink->CritSect);
     if (RT_FAILURE(rc))
         return rc;
@@ -1480 +1491 @@
     int rc;
 
-    if (pSink->In.pStreamRecSource) /* Disable old recording source, if any set. */
+    if (pSink->In.pStreamRecSource) /* First, disable old recording source, if any set. */
     {
         const PPDMIAUDIOCONNECTOR pConn = pSink->In.pStreamRecSource->pConn;
@@ -1495 +1506 @@
             AssertPtr(pStream->pStream);
             AssertMsg(pStream->pStream->enmDir == PDMAUDIODIR_IN, ("Specified stream is not an input stream\n"));
-        }
-
-        pSink->In.pStreamRecSource = pStream;
-
-        if (pSink->In.pStreamRecSource)
-        {
-            const PPDMIAUDIOCONNECTOR pConn = pSink->In.pStreamRecSource->pConn;
-            AssertPtr(pConn);
-            rc = pConn->pfnEnable(pConn, PDMAUDIODIR_IN, true /* Enable */);
+            AssertPtr(pStream->pConn);
+            rc = pStream->pConn->pfnEnable(pStream->pConn, PDMAUDIODIR_IN, true /* Enable */);
+            if (RT_SUCCESS(rc))
+            {
+                pSink->In.pStreamRecSource = pStream;
+            }
+            else if (pSink->In.pStreamRecSource->pConn) /* Stay with the current recording source (if any) and re-enable it. */
+            {
+                const PPDMIAUDIOCONNECTOR pConn = pSink->In.pStreamRecSource->pConn;
+                AssertPtr(pConn);
+                rc = pConn->pfnEnable(pConn, PDMAUDIODIR_IN, true /* Enable */);
+            }
         }
     }
@@ -1515 +1529 @@
                 pSink->pszName, pSink->In.pStreamRecSource ? pSink->In.pStreamRecSource->pszName : "<None>"));
     }
-    else
+    else if (rc != VERR_AUDIO_STREAM_NOT_READY)
+    {
         LogRel(("Mixer: Setting recording source of sink '%s' to '%s' failed with %Rrc\n",
                 pSink->pszName, pSink->In.pStreamRecSource ? pSink->In.pStreamRecSource->pszName : "<None>", rc));
+    }
 
     return rc;

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

@@ -514 +514 @@
     {
         if (   rc != VERR_NOT_IMPLEMENTED
-            && rc != VERR_NOT_SUPPORTED)
+            && rc != VERR_NOT_SUPPORTED
+            && rc != VERR_AUDIO_STREAM_NOT_READY)
+        {
             LogRel(("Audio: %s stream '%s' failed with %Rrc\n", DrvAudioHlpStreamCmdToStr(enmStreamCmd), pStream->szName, rc));
+        }
 
         LogFunc(("[%s] %s failed with %Rrc\n", pStream->szName, DrvAudioHlpStreamCmdToStr(enmStreamCmd), rc));
@@ -2664 +2667 @@
                                                     fEnable ? PDMAUDIOSTREAMCMD_ENABLE : PDMAUDIOSTREAMCMD_DISABLE);
             if (RT_FAILURE(rc2))
-                LogRel(("Audio: Failed to %s %s stream '%s', rc=%Rrc\n",
-                        fEnable ? "enable" : "disable", enmDir == PDMAUDIODIR_IN ? "input" : "output", pStream->szName, rc2));
+            {
+                if (rc2 == VERR_AUDIO_STREAM_NOT_READY)
+                {
+                    LogRel(("Audio: Stream '%s' not available\n", pStream->szName));
+                }
+                else
+                    LogRel(("Audio: Failed to %s %s stream '%s', rc=%Rrc\n",
+                            fEnable ? "enable" : "disable", enmDir == PDMAUDIODIR_IN ? "input" : "output", pStream->szName, rc2));
+            }
 
             if (RT_SUCCESS(rc))
@@ -3207 +3217 @@
     LogFlowFunc(("[%s] cRefs=%RU32\n", pStream->szName, pStream->cRefs));
 
-    if (pStream->cRefs > 1)
-        return VERR_WRONG_ORDER;
+    AssertMsgReturn(pStream->cRefs <= 1,
+                    ("Stream '%s' still has %RU32 references held when uninitializing\n", pStream->szName, pStream->cRefs),
+                    VERR_WRONG_ORDER);
 
     int rc = drvAudioStreamControlInternal(pThis, pStream, PDMAUDIOSTREAMCMD_DISABLE);