Changeset 67647 in vbox for trunk/src/VBox

Timestamp:

Jun 27, 2017 4:38:49 PM (8 years ago)

Author:

vboxsync

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

116421

Message:

Audio/DrvAudio.cpp: Bail out in drvAudioStreamPlayRaw() and drvAudioStreamPlayNonInterleaved() if the backend did not play anything.

File:

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

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

@@ -1318 +1318 @@
                 rc = pThis->pHostDrvAudio->pfnStreamPlay(pThis->pHostDrvAudio, pHstStream->pvBackend,
                                                          auBuf, cbRead, &cbPlayed);
-                if (RT_FAILURE(rc))
+                if (   RT_FAILURE(rc)
+                    || !cbPlayed)
+                {
                     break;
+                }
 
 #ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
@@ -1400 +1403 @@
                 && csRead)
             {
-                uint32_t csPlayedChunk;
-
+                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, &csPlayedChunk);
-                if (RT_FAILURE(rc))
+                                                         aSampleBuf, csRead, &csPlayed);
+                if (   RT_FAILURE(rc)
+                    || !csPlayed)
+                {
                     break;
-
-                csPlayedTotal += csPlayedChunk;
+                }
+
+                csPlayedTotal += csPlayed;
                 Assert(csPlayedTotal <= csToPlay);