Changeset 82988 in vbox

Timestamp:

Feb 5, 2020 11:10:51 AM (5 years ago)

Author:

vboxsync

Message:

DevIchAc97/ichac97R3MixerAddDrvStream: Destroy streams on failure to prevent annoying assertions in STAM about duplicate statistics when the stream is reopened. Not sure if this is the right fix, but clearly someone didn't test ICH97 with VRDP enabled in a debug/strict build.

File:

• trunk/src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (2 diffs)

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

@@ -1855 +1855 @@
             {
                 /* If this is an input stream, always set the latest (added) stream
-                 * as the recording source.
-                 * @todo Make the recording source dynamic (CFGM?). */
+                 * as the recording source. */
+                /** @todo Make the recording source dynamic (CFGM?). */
                 if (pStreamCfg->enmDir == PDMAUDIODIR_IN)
                 {
@@ -1880 +1880 @@
                                  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);
         }