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

Timestamp:

Nov 11, 2016 4:11:23 PM (8 years ago)

Author:

vboxsync

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

111893

Message:

Audio: Reverted part of r111751 to fix unit test failure.

File:

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

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

@@ -1014 +1014 @@
     uint32_t offDstWrite  = pDst->offWrite;
 
+    // Updated code causes tstAudioMixBuffer to fail. Problem is failing the call
+    // when source has no available data, which can apparently happen. See #8521.
+#if 0
     if (!cSrcAvail)
+    {
         return VERR_NO_DATA;
+    }
+#else
+    if (   !cSrcAvail
+        || !cDstAvail)
+    {
+        if (pcProcessed)
+            *pcProcessed = 0;
+        return VINF_SUCCESS;
+    }
+#endif
 
     AUDMIXBUF_LOG(("cSrcSamples=%RU32, cSrcAvail=%RU32 -> cDstAvail=%RU32\n", cSrcSamples,  cSrcAvail, cDstAvail));