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

Timestamp:

Jul 20, 2017 2:30:57 PM (7 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio.cpp: Implemented handling VINF_AUDIO_MORE_DATA_AVAILABLE in drvAudioStreamPlayRaw().

File:

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

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

@@ -1395 +1395 @@
                                  RT_MIN(csLeft, RT_ELEMENTS(aSampleBuf)), &csRead);
 
-            if (   RT_SUCCESS(rc)
-                && csRead)
+            if (RT_SUCCESS(rc))
             {
-                uint32_t csPlayed;
-
-                /* Note: As the stream layout is RPDMAUDIOSTREAMLAYOUT_RAW, operate on audio frames
-                 *       rather on bytes. */
-                Assert(csRead <= RT_ELEMENTS(aSampleBuf));
-                rc = pThis->pHostDrvAudio->pfnStreamPlay(pThis->pHostDrvAudio, pHstStream->pvBackend,
-                                                         aSampleBuf, csRead, &csPlayed);
-                if (   RT_FAILURE(rc)
-                    || !csPlayed)
+                if (csRead)
                 {
+                    uint32_t csPlayed;
+
+                    /* Note: As the stream layout is RPDMAUDIOSTREAMLAYOUT_RAW, operate on audio frames
+                     *       rather on bytes. */
+                    Assert(csRead <= RT_ELEMENTS(aSampleBuf));
+                    rc = pThis->pHostDrvAudio->pfnStreamPlay(pThis->pHostDrvAudio, pHstStream->pvBackend,
+                                                             aSampleBuf, csRead, &csPlayed);
+                    if (   RT_FAILURE(rc)
+                        || !csPlayed)
+                    {
+                        break;
+                    }
+
+                    csPlayedTotal += csPlayed;
+                    Assert(csPlayedTotal <= csToPlay);
+
+                    Assert(csLeft >= csRead);
+                    csLeft        -= csRead;
+                }
+                else
+                {
+                    if (rc == VINF_AUDIO_MORE_DATA_AVAILABLE) /* Do another peeking round if there is more data available. */
+                        continue;
+
                     break;
                 }
-
-                csPlayedTotal += csPlayed;
-                Assert(csPlayedTotal <= csToPlay);
-
-                Assert(csLeft >= csRead);
-                csLeft        -= csRead;
             }
             else if (RT_FAILURE(rc))