Changeset 88432 in vbox for trunk/src

Timestamp:

Apr 9, 2021 12:50:14 PM (4 years ago)

Author:

vboxsync

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

143684

Message:

DrvHostAudioAlsa: Rewrote the pfnStreamGetPending implementation. Didn't take draining into account nor that the delay may always be non-zero due to fixed delays. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvHostAudioAlsa.cpp (modified) (1 diff)
• DrvHostAudioAlsaStubs.cpp (modified) (2 diffs)
• DrvHostAudioAlsaStubsMangling.h (modified) (1 diff)

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

@@ -1376 +1376 @@
 {
     RT_NOREF(pInterface);
-    AssertPtrReturn(pStream, 0);
-
     PALSAAUDIOSTREAM pStreamALSA = (PALSAAUDIOSTREAM)pStream;
-
-    snd_pcm_sframes_t cFramesDelay  = 0;
-    snd_pcm_state_t   enmState = snd_pcm_state(pStreamALSA->phPCM);
-
-    int rc = VINF_SUCCESS;
-
+    AssertPtrReturn(pStreamALSA, 0);
     AssertPtr(pStreamALSA->pCfg);
+
+    /*
+     * This is only relevant to output streams (input streams can't have
+     * any pending, unplayed data).
+     */
+    uint32_t cbPending = 0;
     if (pStreamALSA->pCfg->enmDir == PDMAUDIODIR_OUT)
     {
-        /* Getting the delay (in audio frames) reports the time it will take
-         * to hear a new sample after all queued samples have been played out. */
-        int rc2 = snd_pcm_delay(pStreamALSA->phPCM, &cFramesDelay);
-        if (RT_SUCCESS(rc))
-            rc = rc2;
-
-        /* Make sure to check the stream's status.
-         * If it's anything but SND_PCM_STATE_RUNNING, the delay is meaningless and therefore 0. */
-        if (enmState != SND_PCM_STATE_RUNNING)
-            cFramesDelay = 0;
-    }
-
-    /* Note: For input streams we never have pending data left. */
-
-    Log2Func(("cFramesDelay=%RI32, enmState=%d, rc=%d\n", cFramesDelay, enmState, rc));
-
-    return PDMAudioPropsFramesToBytes(&pStreamALSA->pCfg->Props, cFramesDelay);
+        /*
+         * Getting the delay (in audio frames) reports the time it will take
+         * to hear a new sample after all queued samples have been played out.
+         *
+         * We use snd_pcm_avail_delay instead of snd_pcm_delay here as it will
+         * update the buffer positions, and we can use the extra value against
+         * the buffer size to double check since the delay value may include
+         * fixed built-in delays in the processing chain and hardware.
+         */
+        snd_pcm_sframes_t cFramesAvail = 0;
+        snd_pcm_sframes_t cFramesDelay = 0;
+        int rc = snd_pcm_avail_delay(pStreamALSA->phPCM, &cFramesAvail, &cFramesDelay);
+
+        /*
+         * We now also get the state as the pending value should be zero when
+         * we're not in a playing state.
+         */
+        snd_pcm_state_t enmState = snd_pcm_state(pStreamALSA->phPCM);
+        switch (enmState)
+        {
+            case SND_PCM_STATE_RUNNING:
+            case SND_PCM_STATE_DRAINING:
+                if (rc >= 0)
+                {
+                    if (cFramesAvail >= pStreamALSA->pCfg->Backend.cFramesBufferSize)
+                        cbPending = 0;
+                    else
+                        cbPending = PDMAudioPropsFramesToBytes(&pStreamALSA->pCfg->Props, cFramesDelay);
+                }
+                break;
+
+            default:
+                break;
+        }
+        Log2Func(("returns %u (%#x) - cFramesBufferSize=%RU32 cFramesAvail=%ld cFramesDelay=%ld rc=%d; enmState=%s (%d) \n",
+                  cbPending, cbPending, pStreamALSA->pCfg->Backend.cFramesBufferSize, cFramesAvail, cFramesDelay, rc,
+                  snd_pcm_state_name(enmState), enmState));
+    }
+    return cbPending;
 }
 

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

@@ -58 +58 @@
            (pcm))
 PROXY_STUB(snd_pcm_close, int, (snd_pcm_t *pcm), (pcm))
-PROXY_STUB(snd_pcm_delay, int, (snd_pcm_t *pcm, snd_pcm_sframes_t *frames),
-           (pcm, frames))
+PROXY_STUB(snd_pcm_avail_delay, int,
+           (snd_pcm_t *pcm, snd_pcm_sframes_t *availp, snd_pcm_sframes_t *delayp),
+           (pcm, availp, delayp))
 PROXY_STUB(snd_pcm_nonblock, int, (snd_pcm_t *pcm, int *onoff),
            (pcm, onoff))
@@ -166 +167 @@
 
     ELEMENT(snd_pcm_avail_update),
+    ELEMENT(snd_pcm_avail_delay),
     ELEMENT(snd_pcm_close),
-    ELEMENT(snd_pcm_delay),
     ELEMENT(snd_pcm_drain),
     ELEMENT(snd_pcm_drop),

trunk/src/VBox/Devices/Audio/DrvHostAudioAlsaStubsMangling.h

@@ -35 +35 @@
 #define snd_pcm_avail_update                    ALSA_MANGLER(snd_pcm_avail_update)
 #define snd_pcm_close                           ALSA_MANGLER(snd_pcm_close)
-#define snd_pcm_delay                           ALSA_MANGLER(snd_pcm_delay)
+#define snd_pcm_avail_delay                     ALSA_MANGLER(snd_pcm_avail_delay)
 #define snd_pcm_drain                           ALSA_MANGLER(snd_pcm_drain)
 #define snd_pcm_drop                            ALSA_MANGLER(snd_pcm_drop)