Changeset 88915 in vbox

Timestamp:

May 6, 2021 7:05:09 PM (4 years ago)

Author:

vboxsync

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

144250

Message:

AudioMixer: Added crude heuristics to audioMixerSinkUpdateOutput for prevent that a malfunctioning stream will clog up everything for everyone else. [fix] bugref:9890

File:

• trunk/src/VBox/Devices/Audio/AudioMixer.cpp (modified) (3 diffs)

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

@@ -1700 +1700 @@
                         pMixStream->fUnreliable = true;
                         Log3Func(("%s: Marked '%s' as unreliable.\n", pSink->pszName, pMixStream->pszName));
-                        pMixStreamMin = pMixStreamMin;
+                        pMixStreamMin = pMixStream;
                     }
                     else
                     {
                         if (!pMixStreamMin || pMixStream->cFramesLastAvail < pMixStreamMin->cFramesLastAvail)
-                            pMixStreamMin = pMixStreamMin;
+                            pMixStreamMin = pMixStream;
                         cReliableStreams++;
                     }
@@ -1712 +1712 @@
         }
 
-        if (cMarkedUnreliable == 0 && pMixStreamMin && cReliableStreams > 1)
+        if (cMarkedUnreliable == 0 && cReliableStreams > 1 && pMixStreamMin != NULL)
         {
             cReliableStreams--;
@@ -1718 +1718 @@
             pMixStreamMin->fUnreliable = true;
             Log3Func(("%s: Marked '%s' as unreliable (%u frames).\n",
-                      pSink->pszName, pMixStream->pszName, pMixStream->cFramesLastAvail));
+                      pSink->pszName, pMixStreamMin->pszName, pMixStreamMin->cFramesLastAvail));
         }