Changeset 64981 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Dec 21, 2016 1:24:13 PM (8 years ago)

Author:

vboxsync

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

112464

Message:

Audio/AudioMixBuffer.cpp: Removed VERR_NO_DATA rc from audioMixBufMixTo() again.

File:

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

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

@@ -975 +975 @@
  *
  * @return  IPRT status code.
- *          VERR_NO_DATA if the source does not have any audio data.
  *          VERR_BUFFER_UNDERFLOW if the source did not have enough audio data.
  *          VERR_BUFFER_OVERFLOW if the destination did not have enough space to store the converted source audio data.
@@ -1014 +1013 @@
     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
+    AUDMIXBUF_LOG(("cSrcSamples=%RU32, cSrcAvail=%RU32 -> cDstAvail=%RU32\n", cSrcSamples,  cSrcAvail, cDstAvail));
+
     if (   !cSrcAvail
         || !cDstAvail)
@@ -1029 +1022 @@
         return VINF_SUCCESS;
     }
-#endif
-
-    AUDMIXBUF_LOG(("cSrcSamples=%RU32, cSrcAvail=%RU32 -> cDstAvail=%RU32\n", cSrcSamples,  cSrcAvail, cDstAvail));
 
 #ifdef DEBUG