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

Timestamp:

Jun 6, 2021 11:07:39 PM (4 years ago)

Author:

vboxsync

Message:

DrvHostAudioPulseAudio: Fixed bug in drvHstAudPaHA_StreamGetReadable where it would return a too high value when we have a peek buffer left over from a previous drvHstAudPaHA_StreamCapture. Same as in the windows wasapi, the peeked buffer is still part of the readable count and must be subtrackted. bugref:9890

File:

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

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

@@ -1855 +1855 @@
             size_t cbReadablePa = pa_stream_readable_size(pStreamPA->pStream);
             if (cbReadablePa != (size_t)-1)
-                cbReadable = (uint32_t)cbReadablePa;
+            {
+                /* As with WASAPI on windows, the peek buffer must be subtracked.*/
+                if (cbReadablePa >= pStreamPA->cbPeekBuf)
+                    cbReadable = (uint32_t)(cbReadablePa - pStreamPA->cbPeekBuf);
+                else
+                {
+                    AssertMsgFailed(("%#zx vs %#zx\n", cbReadablePa, pStreamPA->cbPeekBuf));
+                    cbReadable = 0;
+                }
+            }
             else
                 drvHstAudPaError(pThis, "pa_stream_readable_size failed on '%s'", pStreamPA->Cfg.szName);