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

Timestamp:

Jun 7, 2021 12:12:46 AM (4 years ago)

Author:

vboxsync

Message:

DrvHostAudioPulseAudio: Don't trigger the stream unnecessarily when draining. Added an offInternal member to the stream like in most other backends and use it for deciding whether we've passed the PA pre-buffering threshold or not. bugref:9890

File:

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

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

@@ -154 +154 @@
      * won't do any after-freed accesses.) */
     pa_operation           *pTriggerOp;
-    /** Output: Current latency (in microsecs). */
-    uint64_t                cUsLatency;
+    /** Internal byte offset. */
+    uint64_t                offInternal;
 #ifdef LOG_ENABLED
     /** Creation timestamp (in microsecs) of stream playback / recording. */
@@ -1252 +1252 @@
             LogRel2(("PulseAudio: Requesting: BufAttr: tlength=%#RX32 minReq=%#RX32 prebuf=%#RX32 maxLength=%#RX32\n",
                      pStreamPA->BufAttr.tlength, pStreamPA->BufAttr.minreq, pStreamPA->BufAttr.prebuf, pStreamPA->BufAttr.maxlength));
-
-            /* This (cUsLatency) isn't used for anything. */
-            pStreamPA->cUsLatency = PDMAudioPropsFramesToMicro(&pCfgAcq->Props, pCfgReq->Backend.cFramesBufferSize);
-            LogRel2(("PulseAudio: Initial output latency is %RU64 us (%RU32 bytes)\n",
-                     pStreamPA->cUsLatency, pStreamPA->BufAttr.tlength));
         }
 
@@ -1292 +1287 @@
                 pCfgAcq->Backend.cFramesBufferSize   = PDMAudioPropsBytesToFrames(&pCfgAcq->Props, pStreamPA->BufAttr.tlength);
                 pCfgAcq->Backend.cFramesPreBuffering = PDMAudioPropsBytesToFrames(&pCfgAcq->Props, pStreamPA->BufAttr.prebuf);
+
+                LogRel2(("PulseAudio: Initial output latency is %RU64 us (%RU32 bytes)\n",
+                         PDMAudioPropsBytesToMicro(&pCfgAcq->Props, pStreamPA->BufAttr.tlength), pStreamPA->BufAttr.tlength));
             }
 
@@ -1436 +1434 @@
                  : drvHstAudPaError(pThis, "pa_stream_cork('%s', 0 /*uncork it*/,,) failed", pStreamPA->Cfg.szName);
 
+    pStreamPA->offInternal = 0;
 
     pa_threaded_mainloop_unlock(pThis->pMainLoop);
@@ -1612 +1611 @@
      */
     int rc = VINF_SUCCESS;
-    if (true /** @todo skip this if we're already playing or haven't written any data to the stream since xxxx. */)
+    if (  pStreamPA->offInternal
+        < PDMAudioPropsFramesToBytes(&pStreamPA->Cfg.Props, pStreamPA->Cfg.Backend.cFramesPreBuffering) * 2)
     {
         if (pStreamPA->pTriggerOp)
@@ -1781 +1781 @@
 #ifdef LOG_ENABLED
     const pa_usec_t tsNowUs = pa_rtclock_now();
-    Log3Func(("play delta: %'RI64 us; cbBuf=%#x\n",
-              pStreamPA->tsLastReadWrittenUs ? tsNowUs - pStreamPA->tsLastReadWrittenUs : -1, cbBuf));
+    Log3Func(("play delta: %'RI64 us; cbBuf=%#x @%#RX64\n",
+              pStreamPA->tsLastReadWrittenUs ? tsNowUs - pStreamPA->tsLastReadWrittenUs : -1, cbBuf, pStreamPA->offInternal));
     pStreamPA->tsLastReadWrittenUs = tsNowUs;
 #endif
@@ -1802 +1802 @@
             if (pa_stream_write(pStreamPA->pStream, pvBuf, cbToWrite, NULL /*pfnFree*/, 0 /*offset*/, PA_SEEK_RELATIVE) >= 0)
             {
-                cbTotalWritten += cbToWrite;
-                cbBuf          -= cbToWrite;
+                cbTotalWritten         += cbToWrite;
+                cbBuf                  -= cbToWrite;
+                pStreamPA->offInternal += cbToWrite;
                 if (!cbBuf)
                     break;
@@ -1833 +1834 @@
         rc = VINF_SUCCESS;
     }
-    Log3Func(("returns %Rrc *pcbWritten=%#x iLoop=%u\n", rc, cbTotalWritten, iLoop));
+    Log3Func(("returns %Rrc *pcbWritten=%#x iLoop=%u @%#RX64\n", rc, cbTotalWritten, iLoop, pStreamPA->offInternal));
     return rc;
 }
@@ -1893 +1894 @@
 #ifdef LOG_ENABLED
     const pa_usec_t tsNowUs = pa_rtclock_now();
-    Log3Func(("capture delta: %'RI64 us; cbBuf=%#x\n",
-              pStreamPA->tsLastReadWrittenUs ? tsNowUs - pStreamPA->tsLastReadWrittenUs : -1, cbBuf));
+    Log3Func(("capture delta: %'RI64 us; cbBuf=%#x @%#RX64\n",
+              pStreamPA->tsLastReadWrittenUs ? tsNowUs - pStreamPA->tsLastReadWrittenUs : -1, cbBuf, pStreamPA->offInternal));
     pStreamPA->tsLastReadWrittenUs = tsNowUs;
 #endif
@@ -1910 +1911 @@
         {
             memcpy(pvBuf, &pStreamPA->pbPeekBuf[pStreamPA->offPeekBuf], cbBuf);
-            pStreamPA->offPeekBuf += cbBuf;
-            *pcbRead               = cbBuf;
+            pStreamPA->offPeekBuf  += cbBuf;
+            pStreamPA->offInternal += cbBuf;
+            *pcbRead                = cbBuf;
+
             if (cbToCopy == cbBuf)
             {
@@ -1920 +1923 @@
                 pa_threaded_mainloop_unlock(pThis->pMainLoop);
             }
-            Log3Func(("returns *pcbRead=%#x from prev peek buf (%#x/%#x)\n", cbBuf, pStreamPA->offPeekBuf, pStreamPA->cbPeekBuf));
+            Log3Func(("returns *pcbRead=%#x from prev peek buf (%#x/%#x) @%#RX64\n",
+                      cbBuf, pStreamPA->offPeekBuf, pStreamPA->cbPeekBuf, pStreamPA->offInternal));
             return VINF_SUCCESS;
         }
@@ -1970 +1974 @@
                         {
                             memcpy(pvBuf, pStreamPA->pbPeekBuf, cbBuf);
-                            cbTotalRead          += cbBuf;
-                            pStreamPA->offPeekBuf = cbBuf;
+                            cbTotalRead            += cbBuf;
+                            pStreamPA->offPeekBuf   = cbBuf;
+                            pStreamPA->offInternal += cbBuf;
                             cbBuf = 0;
                             break;
                         }
                         memcpy(pvBuf, pStreamPA->pbPeekBuf, pStreamPA->cbPeekBuf);
-                        cbBuf       -= pStreamPA->cbPeekBuf;
-                        pvBuf        = (uint8_t *)pvBuf + pStreamPA->cbPeekBuf;
-                        cbTotalRead += pStreamPA->cbPeekBuf;
-
-                        pStreamPA->pbPeekBuf = NULL;
+                        cbBuf                  -= pStreamPA->cbPeekBuf;
+                        pvBuf                   = (uint8_t *)pvBuf + pStreamPA->cbPeekBuf;
+                        cbTotalRead            += pStreamPA->cbPeekBuf;
+                        pStreamPA->offInternal += cbBuf;
+
+                        pStreamPA->pbPeekBuf    = NULL;
                     }
                     else
@@ -2026 +2032 @@
         rc = VINF_SUCCESS;
     }
-    Log3Func(("returns %Rrc *pcbRead=%#x (%#x left, peek %#x/%#x)\n",
-              rc, cbTotalRead, cbBuf, pStreamPA->offPeekBuf, pStreamPA->cbPeekBuf));
+    Log3Func(("returns %Rrc *pcbRead=%#x (%#x left, peek %#x/%#x) @%#RX64\n",
+              rc, cbTotalRead, cbBuf, pStreamPA->offPeekBuf, pStreamPA->cbPeekBuf, pStreamPA->offInternal));
     return rc;
 }