Changeset 89190 in vbox

Timestamp:

May 19, 2021 9:49:59 PM (4 years ago)

Author:

vboxsync

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

144531

Message:

AudioMixer: Don't get stuck if AudioMixerSinkRead returns zero bytes and AudioMixerSinkGetReadable didn't. AudioMixerSinkGetReadable should check the stream status like AudioMixerSinkRead does. bugref:9890

File:

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

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

@@ -1066 +1066 @@
 #else
         PAUDMIXSTREAM pStreamRecSource = pSink->In.pStreamRecSource;
-        if (!pStreamRecSource)
-        {
-            Log3Func(("[%s] No recording source specified, skipping ...\n", pSink->pszName));
-        }
-        else
+        if (   pStreamRecSource
+            && (pStreamRecSource->fStatus & AUDMIXSTREAM_STATUS_CAN_READ))
         {
             AssertPtr(pStreamRecSource->pConn);
             cbReadable = pStreamRecSource->pConn->pfnStreamGetReadable(pStreamRecSource->pConn, pStreamRecSource->pStream);
         }
+        else if (!pStreamRecSource)
+            Log3Func(("[%s] No recording source specified, skipping ...\n", pSink->pszName));
+        else
+            Log3Func(("[%s] The recording source is not readable!\n", pSink->pszName));
 #endif
     }
@@ -2422 +2423 @@
         int rc = AudioMixerSinkRead(pSink, abBuf, RT_MIN(cbToTransfer, sizeof(abBuf)), &cbRead);
         AssertRCBreak(rc);
-        AssertMsg(cbRead > 0, ("Nothing read from sink, even if %#RX32 bytes were (still) announced\n", cbToTransfer));
+        AssertMsgBreak(cbRead > 0, ("Nothing read from sink, even if %#RX32 bytes were (still) announced\n", cbToTransfer));
 
         /* Write it to the internal DMA buffer. */