Changeset 89449 in vbox

Timestamp:

Jun 1, 2021 11:37:30 PM (3 years ago)

Author:

vboxsync

Message:

DrvHostAudioAlsa: Need to call snd_pcm_drain again when draining in non-blocking mode, otherwise we won't get out of it. Using the status getter for that, as it'll yield quicker results for the caller than the play function. Removed the channel count restrictions. bugref:9890

File:

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

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

@@ -501 +501 @@
     AssertLogRelMsgReturn(err >= 0, ("ALSA: Failed to get start threshold: %s\n", snd_strerror(err)), err);
 
-    LogRel2(("ALSA: SW params: %ul frames threshold, %ul frame avail minimum\n",
+    LogRel2(("ALSA: SW params: %lu frames threshold, %lu frame avail minimum\n",
              pCfgObt->threshold, pCfgReq->period_size));
     return 0;
@@ -548 +548 @@
     err = snd_pcm_hw_params_set_channels_near(hPCM, pHWParms, &cChannels);
     AssertLogRelMsgReturn(err >= 0, ("ALSA: Failed to set number of channels to %d\n", pCfgReq->cChannels), err);
-    AssertLogRelMsgReturn(cChannels == 1 || cChannels == 2, ("ALSA: Number of audio channels (%u) not supported\n", cChannels), -1);
     pCfgObt->cChannels = cChannels;
 
@@ -1129 +1128 @@
     PDMHOSTAUDIOSTREAMSTATE enmStreamState = PDMHOSTAUDIOSTREAMSTATE_OKAY;
     snd_pcm_state_t         enmAlsaState   = snd_pcm_state(pStreamALSA->hPCM);
+    if (enmAlsaState == SND_PCM_STATE_DRAINING)
+    {
+        /* We're operating in non-blocking mode, so we must (at least for a demux
+           config) call snd_pcm_drain again to drive it forward.  Otherwise we
+           might be stuck in the drain state forever. */
+        Log5Func(("Calling snd_pcm_drain again...\n"));
+        snd_pcm_drain(pStreamALSA->hPCM);
+        enmAlsaState = snd_pcm_state(pStreamALSA->hPCM);
+    }
+
     if (enmAlsaState == SND_PCM_STATE_DRAINING)
         enmStreamState = PDMHOSTAUDIOSTREAMSTATE_DRAINING;