Changeset 67436 in vbox for trunk/src

Timestamp:

Jun 16, 2017 11:56:45 AM (8 years ago)

Author:

vboxsync

Message:

Audio/AudioMixer.cpp: Resolved deadlock in AudioMixerSinkGetWritable().

File:

• trunk/src/VBox/Devices/Audio/AudioMixer.cpp (modified) (1 diff)

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

@@ -874 +874 @@
         return 0;
 
-    if (   !(pSink->fStatus & AUDMIXSINK_STS_RUNNING)
-        || pSink->fStatus & AUDMIXSINK_STS_PENDING_DISABLE)
-    {
-        return 0;
-    }
-
     uint32_t cbWritable = 0;
 
+    if (    (pSink->fStatus & AUDMIXSINK_STS_RUNNING)
+        && !(pSink->fStatus & AUDMIXSINK_STS_PENDING_DISABLE))
+    {
 #ifdef VBOX_AUDIO_MIXER_WITH_MIXBUF
 # error "Implement me!"
 #else
-    /* The hosts sets the pace --
-     * so we try to find the minimum of writable data to all connected streams to this sink. */
-    PAUDMIXSTREAM pMixStream;
-    RTListForEach(&pSink->lstStreams, pMixStream, AUDMIXSTREAM, Node)
-    {
-        if (!(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTRMSTS_FLAG_ENABLED))
-        {
-            Log3Func(("[%s] Stream '%s' disabled, skipping ...\n", pSink->pszName, pMixStream->pszName));
-            continue;
-        }
-
-        const uint32_t cbWritableStream = pMixStream->pConn->pfnStreamGetWritable(pMixStream->pConn, pMixStream->pStream);
-
-        if (cbWritable < cbWritableStream)
-            cbWritable = cbWritableStream;
-
-        break; /** @todo For now the first stream sets the pace. */
-    }
+        /* The hosts sets the pace --
+         * so we try to find the minimum of writable data to all connected streams to this sink. */
+        PAUDMIXSTREAM pMixStream;
+        RTListForEach(&pSink->lstStreams, pMixStream, AUDMIXSTREAM, Node)
+        {
+            if (!(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTRMSTS_FLAG_ENABLED))
+            {
+                Log3Func(("[%s] Stream '%s' disabled, skipping ...\n", pSink->pszName, pMixStream->pszName));
+                continue;
+            }
+
+            const uint32_t cbWritableStream = pMixStream->pConn->pfnStreamGetWritable(pMixStream->pConn, pMixStream->pStream);
+
+            if (cbWritable < cbWritableStream)
+                cbWritable = cbWritableStream;
+
+            break; /** @todo For now the first stream sets the pace. */
+        }
 #endif
+    }
 
     Log3Func(("[%s] cbWritable=%RU32\n", pSink->pszName, cbWritable));