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

Timestamp:

Jun 5, 2021 1:54:59 AM (4 years ago)

Author:

vboxsync

Message:

DrvHostAudioPulseAudio: Use the default BufAttr.minreq value (output only), otherwise I'm getting slightly distored output here on a builtin intel HDA device. Logging adjustments. bugref:9890

File:

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

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

@@ -733 +733 @@
     int       fNegative  = 0;
     int       rcPa = pa_stream_get_latency(pStream, &cUsLatency, &fNegative);
-    Log2Func(("Requesting %zu bytes; Latency: %'RU64 us%s\n",
-              cbLen, cUsLatency, rcPa == 0 ? " - pa_stream_get_latency failed!" : ""));
-}
-
-
-/**
- * Debug PA callback: Underflow.  This may happen when draing/corking.
+    Log2Func(("Requesting %zu bytes; Latency: %'RU64 us (rcPa=%d n=%d)\n", cbLen, cUsLatency, rcPa, fNegative));
+}
+
+
+/**
+ * Debug PA callback: Underflow.  This may happen when draining/corking.
  */
 static void drvHstAudPaStreamUnderflowDebugCallback(pa_stream *pStream, void *pvContext)
@@ -750 +749 @@
     LogRel2(("PulseAudio: Warning: Hit underflow #%RU32\n", pStrm->cUnderflows));
 
+# if 0
     if (   pStrm->cUnderflows >= 6                /** @todo Make this check configurable. */
         && pStrm->cUsLatency  < 2U*RT_US_1SEC)
@@ -766 +766 @@
         pStrm->cUnderflows = 0;
     }
+# endif
 
     pa_usec_t cUsLatency = 0;
@@ -788 +789 @@
 
 /**
- * Debug PA callback: Overflow.  This may happen when draing/corking.
+ * Debug PA callback: Overflow.  This may happen when draining/corking.
  */
 static void drvHstAudPaStreamOverflowDebugCallback(pa_stream *pStream, void *pvContext)
@@ -1167 +1168 @@
             pStreamPA->cUsLatency        = PDMAudioPropsFramesToMicro(&pCfgAcq->Props, pCfgReq->Backend.cFramesBufferSize);
             pStreamPA->BufAttr.tlength   = pa_usec_to_bytes(pStreamPA->cUsLatency, &pStreamPA->SampleSpec);
+#if 0 /* bird: Bad bad idea. Messes up output via a "Intel Corporation 200 Series PCH HD Audio"
+               device here on fedora-32. Just use the default instead. */
             pStreamPA->BufAttr.minreq    = PDMAudioPropsFramesToBytes(&pCfgAcq->Props, pCfgReq->Backend.cFramesPeriod);
+#else
+            pStreamPA->BufAttr.minreq    = -1;
+#endif
             pStreamPA->BufAttr.prebuf    = pa_usec_to_bytes(PDMAudioPropsFramesToMicro(&pCfgAcq->Props,
                                                                                        pCfgReq->Backend.cFramesPreBuffering),
@@ -1657 +1663 @@
 #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: %'RI64 us; cbBuf=%#x\n",
+              pStreamPA->tsLastReadWrittenUs ? tsNowUs - pStreamPA->tsLastReadWrittenUs : -1, cbBuf));
     pStreamPA->tsLastReadWrittenUs = tsNowUs;
 #endif
@@ -1759 +1766 @@
 #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: %'RI64 us; cbBuf=%#x\n",
+              pStreamPA->tsLastReadWrittenUs ? tsNowUs - pStreamPA->tsLastReadWrittenUs : -1, cbBuf));
     pStreamPA->tsLastReadWrittenUs = tsNowUs;
 #endif