Changeset 88512 in vbox

Timestamp:

Apr 14, 2021 7:04:27 PM (3 years ago)

Author:

vboxsync

Message:

DrvHostAudioPulseAudio: Don't clamp the pfnStreamWritable result to BufAttr.maxlength, we deal with that by looping in pfnStreamPlay instead. bugref:9890

File:

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

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

@@ -1523 +1523 @@
             size_t cbWritablePa = pa_stream_writable_size(pStreamPA->pStream);
             if (cbWritablePa != (size_t)-1)
-            {
-                /* Don't report more writable than the PA server can handle. */
-                if (cbWritablePa <= pStreamPA->BufAttr.maxlength)
-                    cbWritable = (uint32_t)cbWritablePa;
-                else
-                {
-                    Log3Func(("Clamping cbWritablePa=%#zx to maxLength=%#RX32\n", cbWritablePa, pStreamPA->BufAttr.maxlength));
-                    cbWritable = (uint32_t)pStreamPA->BufAttr.maxlength;
-                }
-            }
+                cbWritable = cbWritablePa <= UINT32_MAX ? (uint32_t)cbWritablePa : UINT32_MAX;
             else
                 drvHostAudioPaError(pThis, "pa_stream_writable_size failed on '%s'", pStreamPA->Cfg.szName);
@@ -1589 +1580 @@
 #ifdef LOG_ENABLED
     const pa_usec_t tsNowUs = pa_rtclock_now();
-    Log3Func(("play delta: %RU64 us; cbBuf=%#x\n", tsNowUs - pStreamPA->tsLastReadWrittenUs, cbBuf));
+    Log3Func(("play delta: %'RU64 us; cbBuf=%#x\n", tsNowUs - pStreamPA->tsLastReadWrittenUs, cbBuf));
     pStreamPA->tsLastReadWrittenUs = tsNowUs;
 #endif
@@ -1660 +1651 @@
 #ifdef LOG_ENABLED
     const pa_usec_t tsNowUs = pa_rtclock_now();
-    Log3Func(("capture delta: %RU64 us; cbBuf=%#x\n", tsNowUs - pStreamPA->tsLastReadWrittenUs, cbBuf));
+    Log3Func(("capture delta: %'RU64 us; cbBuf=%#x\n", tsNowUs - pStreamPA->tsLastReadWrittenUs, cbBuf));
     pStreamPA->tsLastReadWrittenUs = tsNowUs;
 #endif