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

Timestamp:

May 6, 2021 4:35:40 PM (4 years ago)

Author:

vboxsync

Message:

Audio/Dev*: Stream adding cleanup fixes. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHda.cpp (modified) (1 diff)
• DevIchAc97.cpp (modified) (1 diff)
• DevSB16.cpp (modified) (1 diff)

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

@@ -2364 +2364 @@
                              pDrv->uLUN, StreamCfg.szName, rc));
             }
-        }
-/** @todo r=bird: We are missing cleanup code here!   */
+            if (RT_FAILURE(rc))
+                AudioMixerSinkRemoveStream(pMixSink, pMixStrm);
+        }
+        if (RT_FAILURE(rc))
+            AudioMixerStreamDestroy(pMixStrm, pDevIns);
     }
 

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

@@ -1902 +1902 @@
                                  pDrv->uLUN, pStreamCfg->szName, rc));
                 }
-                /** @todo r=bird: see below. */
                 if (RT_FAILURE(rc))
                     AudioMixerSinkRemoveStream(pMixSink, pMixStrm);
             }
-            /** @todo r=bird: I've added this destroy stuff here, because if it looks as if
-             * you just drop the stream if the AudioMixerSinkAddStream fails for some
-             * reason.  This is definitely true if AudioMixerSinkSetRecordingSource fails
-             * above, because it leads to duplicate statistics when starting XP with ICH97
-             * and VRDP enabled.  Looks like the VRDP line-in fails with
-             * VERR_AUDIO_STREAM_NOT_READY when configured for 8000HZ, then it asserts in
-             * STAM when 48000Hz is configured right afterwards. */
             if (RT_FAILURE(rc))
                 AudioMixerStreamDestroy(pMixStrm, pDevIns);

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

@@ -2008 +2008 @@
             rc = AudioMixerSinkAddStream(pMixSink, pMixStrm);
             LogFlowFunc(("LUN#%RU8: Added stream \"%s\" to sink, rc=%Rrc\n", pDrv->uLUN, pStreamCfg->szName, rc));
-
             if (RT_SUCCESS(rc))
-            {
                 pDrvStream->pMixStrm = pMixStrm;
-            }
             else
                 AudioMixerStreamDestroy(pMixStrm, pDevIns);