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

Timestamp:

Aug 14, 2015 1:10:44 PM (9 years ago)

Author:

vboxsync

Message:

Audio/ALSA: fixed playing audio after suspendign the host

File:

• trunk/src/VBox/Devices/Audio/DrvHostALSAAudio.cpp (modified) (2 diffs)

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

@@ -148 +148 @@
 } DRVHOSTALSAAUDIO, *PDRVHOSTALSAAUDIO;
 
+/** Maximum number of tries to recover a broken pipe. */
+#define ALSA_RECOVERY_TRIES_MAX    5
+
 typedef struct ALSAAUDIOSTREAMCFG
 {
@@ -957 +960 @@
             AssertBreak(cbRead);
 
-            cWritten = snd_pcm_writei(pThisStrmOut->phPCM, pThisStrmOut->pvBuf, cRead);
-            if (cWritten <= 0)
+            /* Don't try infinitely on recoverable errors. */
+            unsigned iTry;
+            for (iTry = 0; iTry < ALSA_RECOVERY_TRIES_MAX; iTry++)
             {
-                switch (cWritten)
+                cWritten = snd_pcm_writei(pThisStrmOut->phPCM, pThisStrmOut->pvBuf, cRead);
+                if (cWritten <= 0)
                 {
-                    case 0:
+                    switch (cWritten)
                     {
-                        LogFunc(("Failed to write %RI32 frames\n", cRead));
-                        rc = VERR_ACCESS_DENIED;
-                        break;
-                    }
-
-                    case -EPIPE:
-                    {
-                        rc = drvHostALSAAudioRecover(pThisStrmOut->phPCM);
-                        if (RT_FAILURE(rc))
-                            break;
-
-                        LogFlowFunc(("Recovered from playback\n"));
-                        continue;
-                    }
-
-                    case -ESTRPIPE:
-                    {
-                        /* Stream was suspended and waiting for a recovery. */
-                        rc = drvHostALSAAudioResume(pThisStrmOut->phPCM);
-                        if (RT_FAILURE(rc))
+                        case 0:
                         {
-                            LogRel(("ALSA: Failed to resume output stream\n"));
+                            LogFunc(("Failed to write %RI32 frames\n", cRead));
+                            rc = VERR_ACCESS_DENIED;
                             break;
                         }
 
-                        LogFlowFunc(("Resumed suspended output stream\n"));
-                        continue;
+                        case -EPIPE:
+                        {
+                            rc = drvHostALSAAudioRecover(pThisStrmOut->phPCM);
+                            if (RT_FAILURE(rc))
+                                break;
+
+                            LogFlowFunc(("Recovered from playback\n"));
+                            continue;
+                        }
+
+                        case -ESTRPIPE:
+                        {
+                            /* Stream was suspended and waiting for a recovery. */
+                            rc = drvHostALSAAudioResume(pThisStrmOut->phPCM);
+                            if (RT_FAILURE(rc))
+                            {
+                                LogRel(("ALSA: Failed to resume output stream\n"));
+                                break;
+                            }
+
+                            LogFlowFunc(("Resumed suspended output stream\n"));
+                            continue;
+                        }
+
+                        default:
+                            LogFlowFunc(("Failed to write %RI32 output frames, rc=%Rrc\n",
+                                         cRead, rc));
+                            rc = VERR_GENERAL_FAILURE; /** @todo */
+                            break;
                     }
-
-                    default:
-                        LogFlowFunc(("Failed to write %RI32 output frames, rc=%Rrc\n",
-                                     cRead, rc));
-                        rc = VERR_GENERAL_FAILURE; /** @todo */
-                        break;
                 }
-            }
+                else
+                    break;
+            } /* For number of tries. */
+
+            if (   iTry == ALSA_RECOVERY_TRIES_MAX
+                && cWritten <= 0)
+                rc = VERR_BROKEN_PIPE;
 
             if (RT_FAILURE(rc))