Changeset 27105 in vbox

Timestamp:

Mar 5, 2010 3:36:32 PM (15 years ago)

Author:

vboxsync

Message:

pulse: drain the out stream before we disable the voice

Location:

trunk/src/VBox/Devices/Audio

Files:

• pulse_stubs.c (modified) (2 diffs)
• pulseaudio.c (modified) (11 diffs)

trunk/src/VBox/Devices/Audio/pulse_stubs.c

@@ -181 +181 @@
                 (o))
 PROXY_STUB     (pa_operation_get_state, pa_operation_state_t,
+                (pa_operation *o),
+                (o))
+PROXY_STUB_VOID(pa_operation_cancel,
                 (pa_operation *o),
                 (o))
@@ -241 +244 @@
     ELEMENT(pa_operation_unref),
     ELEMENT(pa_operation_get_state),
+    ELEMENT(pa_operation_cancel),
     ELEMENT(pa_strerror),
     ELEMENT(pa_stream_readable_size)

trunk/src/VBox/Devices/Audio/pulseaudio.c

@@ -70 +70 @@
     size_t         cbPeekBuf;
     size_t         offPeekBuf;
+    pa_operation   *pDrainOp;
 } PulseVoice;
 
@@ -147 +148 @@
 }
 
-static void context_state_callback(pa_context *c, void *userdata)
+static void stream_success_callback(pa_stream *pStream, int fSuccess, void *userdata)
 {
     PulseVoice *pPulse = (PulseVoice *)userdata;
-    switch (pa_context_get_state(c))
+    pPulse->fOpSuccess = fSuccess;
+    if (!fSuccess)
+    {
+        if (pPulse->cErrors < MAX_LOG_REL_ERRORS)
+        {
+            int rc = pa_context_errno(g_pContext);
+            pPulse->cErrors++;
+            LogRel(("Pulse: Failed stream operation: %s\n", pa_strerror(rc)));
+        }
+    }
+    pa_threaded_mainloop_signal(g_pMainLoop, 0);
+}
+
+/**
+ * Synchronously wait until an operation completed.
+ */
+static int pulse_wait_for_operation (pa_operation *op)
+{
+    if (op)
+    {
+        while (pa_operation_get_state(op) == PA_OPERATION_RUNNING)
+            pa_threaded_mainloop_wait(g_pMainLoop);
+        pa_operation_unref(op);
+    }
+
+    return 1;
+}
+
+/**
+ * Context status changed.
+ */
+static void context_state_callback(pa_context *pContext, void *userdata)
+{
+    PulseVoice *pPulse = (PulseVoice *)userdata;
+    switch (pa_context_get_state(pContext))
     {
         case PA_CONTEXT_READY:
@@ -169 +204 @@
 }
 
-static void stream_state_callback(pa_stream *s, void *userdata)
-{
-    switch (pa_stream_get_state(s))
+/**
+ * Stream status changed.
+ */
+static void stream_state_callback(pa_stream *pStream, void *userdata)
+{
+    switch (pa_stream_get_state(pStream))
     {
         case PA_STREAM_READY:
@@ -182 +220 @@
             break;
     }
+}
+
+/**
+ * Callback called when our pa_stream_drain operation was completed.
+ */
+static void stream_drain_callback(pa_stream *pStream, int fSuccess, void *userdata)
+{
+    PulseVoice *pPulse = (PulseVoice *)userdata;
+    pPulse->fOpSuccess = fSuccess;
+    if (!fSuccess)
+    {
+        if (pPulse->cErrors < MAX_LOG_REL_ERRORS)
+        {
+            int rc = pa_context_errno(g_pContext);
+            pPulse->cErrors++;
+            LogRel(("Pulse: Failed stream operation: %s\n", pa_strerror(rc)));
+        }
+    }
+    else
+        pa_operation_unref(pa_stream_cork(pStream, 1, stream_success_callback, userdata));
+
+    pa_operation_unref(pPulse->pDrainOp);
+    pPulse->pDrainOp = NULL;
 }
 
@@ -229 +290 @@
 #endif
 
+    /* no input/output right away after the stream was started */
+    flags |= PA_STREAM_START_CORKED;
+
     if (fIn)
     {
@@ -246 +310 @@
                 pBufAttr->maxlength, pBufAttr->tlength, pBufAttr->prebuf, pBufAttr->minreq));
 
-        flags |= PA_STREAM_START_CORKED;
-
         if (pa_stream_connect_playback(pStream, /*dev=*/NULL, pBufAttr, flags,
                                        /*cvolume=*/NULL, /*sync_stream=*/NULL) < 0)
@@ -310 +372 @@
     audsettings_t obt_as;
     int cbBuf;
+
+    pPulse->pDrainOp            = NULL;
 
     pPulse->SampleSpec.format   = aud_to_pulsefmt (as->fmt);
@@ -440 +504 @@
 }
 
-static void stream_success_callback(pa_stream *pStream, int success, void *userdata)
-{
-    PulseVoice *pPulse = (PulseVoice *) userdata;
-    pPulse->fOpSuccess = success;
-    if (!success)
-    {
-        if (pPulse->cErrors < MAX_LOG_REL_ERRORS)
-        {
-            int rc = pa_context_errno(g_pContext);
-            pPulse->cErrors++;
-            LogRel(("Pulse: Failed stream operation: %s\n", pa_strerror(rc)));
-        }
-    }
-    pa_threaded_mainloop_signal(g_pMainLoop, 0);
-}
-
-static int pulse_wait_for_operation (pa_operation *op)
-{
-    if (op)
-    {
-        while (pa_operation_get_state(op) == PA_OPERATION_RUNNING)
-            pa_threaded_mainloop_wait(g_pMainLoop);
-        pa_operation_unref(op);
-    }
-
-    return 1;
-}
-
 static int pulse_ctl_out (HWVoiceOut *hw, int cmd, ...)
 {
@@ -477 +513 @@
             /* Start audio output. */
             pa_threaded_mainloop_lock(g_pMainLoop);
-            pulse_wait_for_operation(pa_stream_cork(pPulse->pStream, 0,
-                                                    stream_success_callback, pPulse));
+            if (   pPulse->pDrainOp
+                && pa_operation_get_state(pPulse->pDrainOp) != PA_OPERATION_DONE)
+            {
+                pa_operation_cancel(pPulse->pDrainOp);
+                pa_operation_unref(pPulse->pDrainOp);
+                pPulse->pDrainOp = NULL;
+            }
+            else
+            {
+                /* should return immediately */
+                pulse_wait_for_operation(pa_stream_cork(pPulse->pStream, 0,
+                                                        stream_success_callback, pPulse));
+            }
             pa_threaded_mainloop_unlock(g_pMainLoop);
             break;
 
         case VOICE_DISABLE:
-            /* Pause audio output. Note that we must return immediately from here
-             * so waiting until the buffers are flushed (trigger+drain) is not an
-             * option! It could be sufficient to cork the audio stream (we are
-             * called if the Pause bit of the AC97 x_CR register is set) but ALSA
-             * uses snd_pcm_drop() dropping all pending frames so we do the same
-             * here. */
+            /* Pause audio output (the Pause bit of the AC97 x_CR register is set).
+             * Note that we must return immediately from here! */
             pa_threaded_mainloop_lock(g_pMainLoop);
-            pulse_wait_for_operation(pa_stream_flush(pPulse->pStream,
-                                                     stream_success_callback, pPulse));
-            pulse_wait_for_operation(pa_stream_cork(pPulse->pStream, 1,
-                                                    stream_success_callback, pPulse));
+            if (!pPulse->pDrainOp)
+            {
+                /* should return immediately */
+                pulse_wait_for_operation(pa_stream_trigger(pPulse->pStream,
+                                                           stream_success_callback, pPulse));
+                pPulse->pDrainOp = pa_stream_drain(pPulse->pStream,
+                                                   stream_drain_callback, pPulse);
+            }
             pa_threaded_mainloop_unlock(g_pMainLoop);
             break;
@@ -653 +700 @@
         case VOICE_ENABLE:
             pa_threaded_mainloop_lock(g_pMainLoop);
+            /* should return immediately */
             pulse_wait_for_operation(pa_stream_cork(pPulse->pStream, 0,
                                                     stream_success_callback, pPulse));
@@ -665 +713 @@
                 pPulse->pu8PeekBuf = NULL;
             }
+            /* should return immediately */
             pulse_wait_for_operation(pa_stream_cork(pPulse->pStream, 1,
                                                     stream_success_callback, pPulse));