Changeset 34451 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Nov 29, 2010 11:00:53 AM (14 years ago)

Author:

vboxsync

Message:

Devices/Audio/Alsa: incorporated upstream fix to properly resume a stream suspend which can be necessary after the host was suspended

Location:

trunk/src/VBox/Devices/Audio

Files:

• alsa_stubs.c (modified) (2 diffs)
• alsaaudio.c (modified) (3 diffs)

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

@@ -80 +80 @@
 PROXY_STUB(snd_strerror, const char *, (int errnum), (errnum))
 PROXY_STUB(snd_pcm_drop, int, (snd_pcm_t *pcm), (pcm))
+PROXY_STUB(snd_pcm_resume, int, (snd_pcm_t *pcm), (pcm))
 PROXY_STUB(snd_pcm_hw_params_get_buffer_size, int,
            (const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val),
@@ -137 +138 @@
     ELEMENT(snd_strerror),
     ELEMENT(snd_pcm_drop),
+    ELEMENT(snd_pcm_resume),
     ELEMENT(snd_pcm_hw_params_get_buffer_size),
     ELEMENT(snd_pcm_hw_params_set_rate_near),

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

@@ -664 +664 @@
 }
 
+static int alsa_resume (snd_pcm_t *handle)
+{
+    int err = snd_pcm_resume (handle);
+    if (err < 0) {
+#ifndef VBOX
+        alsa_logerr (err, "Failed to resume handle %p\n", handle);
+#endif
+        return -1;
+    }
+    return 0;
+}
+
 static snd_pcm_sframes_t alsa_get_avail (snd_pcm_t *handle)
 {
@@ -741 +753 @@
                     continue;
 
+                case -ESTRPIPE:
+                    /* stream is suspended and waiting for an
+                       application recovery */
+                    if (alsa_resume (alsa->handle)) {
+#ifndef VBOX
+                        alsa_logerr (written, "Failed to write %d frames\n", len);
+#else
+                        LogRel(("ALSA: Failed to resume output stream\n"));
+#endif
+                        goto exit;
+                    }
+                    if (conf.verbose) {
+                        dolog ("Resuming suspended output stream\n");
+                    }
+                    continue;
+
                 case -EAGAIN:
                     goto exit;
@@ -953 +981 @@
     }
 
-    if (!avail && (snd_pcm_state (alsa->handle) == SND_PCM_STATE_PREPARED)) {
-        avail = hw->samples;
+    if (!avail) {
+        snd_pcm_state_t state;
+        state = snd_pcm_state (alsa->handle);
+        switch (state) {
+            case SND_PCM_STATE_PREPARED:
+                avail = hw->samples;
+                break;
+            case SND_PCM_STATE_SUSPENDED:
+                /* stream is suspended and waiting for an application recovery */
+                if (alsa_resume (alsa->handle)) {
+#ifndef VBOX
+                    dolog ("Failed to resume suspended input stream\n");
+#else
+                    LogRel(("ALSA: Failed to resume input stream\n"));
+#endif
+                    return 0;
+                }
+                if (conf.verbose) {
+                    dolog ("Resuming suspended input stream\n");
+                }
+                break;
+            default:
+                if (conf.verbose) {
+                    dolog ("No frames available and ALSA state is %d\n", state);
+                }
+                return 0;
+        }
     }