Changeset 59470 in vbox for trunk/src/VBox

Timestamp:

Jan 26, 2016 11:32:46 AM (9 years ago)

Author:

vboxsync

Message:

Audio: Warn on non-available audio streams based on the host audio backend's capabilities -- now the device emulation can ask the backend for its configuration to figure out how many input/output streams are supported by that backend. As the device emulation knows how many channels it finally implements, we there then can decide how to deal with the missing streams.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevIchAc97.cpp (modified) (3 diffs)
• DevIchHda.cpp (modified) (3 diffs)
• DevSB16.cpp (modified) (1 diff)
• DrvAudio.cpp (modified) (9 diffs)
• DrvAudio.h (modified) (1 diff)
• DrvHostALSAAudio.cpp (modified) (14 diffs)
• DrvHostCoreAudio.cpp (modified) (1 diff)
• DrvHostDSound.cpp (modified) (1 diff)
• DrvHostPulseAudio.cpp (modified) (2 diffs)

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

@@ -2239 +2239 @@
     }
     else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
-    {
         LogFunc(("No attached driver for LUN #%u\n", uLUN));
-    }
-    else if (RT_FAILURE(rc))
-        AssertMsgFailed(("Failed to attach AC'97 LUN #%u (\"%s\"), rc=%Rrc\n",
-                        uLUN, pszDesc, rc));
 
     if (RT_FAILURE(rc))
@@ -2539 +2534 @@
             AssertPtr(pCon);
 
-            uint8_t cFailed = 0;
-            if (!pCon->pfnIsValidIn (pCon, pDrv->LineIn.pStrmIn))
-                cFailed++;
-            if (!pCon->pfnIsValidIn (pCon, pDrv->MicIn.pStrmIn))
-                cFailed++;
-            if (!pCon->pfnIsValidOut(pCon, pDrv->Out.pStrmOut))
-                cFailed++;
-
-            if (cFailed == 3)
+            bool fValidLineIn = pCon->pfnIsValidIn(pCon, pDrv->LineIn.pStrmIn);
+            bool fValidMicIn  = pCon->pfnIsValidIn (pCon, pDrv->MicIn.pStrmIn);
+            bool fValidOut    = pCon->pfnIsValidOut(pCon, pDrv->Out.pStrmOut);
+
+            if (    !fValidLineIn
+                 && !fValidMicIn
+                 && !fValidOut)
             {
                 LogRel(("AC97: Falling back to NULL backend (no sound audible)\n"));
@@ -2558 +2551 @@
                        "with the consequence that no sound is audible"));
             }
-            else if (cFailed)
+            else
             {
-                if (!pDrv->pConnector->pfnIsValidIn (pCon, pDrv->LineIn.pStrmIn))
-                    LogRel(("AC97: WARNING: Unable to open PCM line input for LUN #%RU32!\n",       pDrv->uLUN));
-                if (!pDrv->pConnector->pfnIsValidIn (pCon, pDrv->MicIn.pStrmIn))
-                    LogRel(("AC97: WARNING: Unable to open PCM microphone input for LUN #%RU32!\n", pDrv->uLUN));
-                if (!pDrv->pConnector->pfnIsValidOut(pCon, pDrv->Out.pStrmOut))
-                    LogRel(("AC97: WARNING: Unable to open PCM output for LUN #%RU32!\n",           pDrv->uLUN));
-
-                char   szMissingStreams[255];
-                size_t len = 0;
-                if (!pCon->pfnIsValidIn (pCon, pDrv->LineIn.pStrmIn))
-                    len = RTStrPrintf(szMissingStreams,
-                                      sizeof(szMissingStreams), "PCM Input");
-                if (!pCon->pfnIsValidIn (pCon, pDrv->MicIn.pStrmIn))
-                    len += RTStrPrintf(szMissingStreams + len,
-                                       sizeof(szMissingStreams) - len, len ? ", PCM Microphone" : "PCM Microphone");
-                if (!pCon->pfnIsValidOut(pCon, pDrv->Out.pStrmOut))
-                    len += RTStrPrintf(szMissingStreams + len,
-                                       sizeof(szMissingStreams) - len, len ? ", PCM Output" : "PCM Output");
-
-                PDMDevHlpVMSetRuntimeError(pDevIns, 0 /*fFlags*/, "HostAudioNotResponding",
-                    N_("Some AC'97 audio streams (%s) could not be opened. Guest applications generating audio "
-                    "output or depending on audio input may hang. Make sure your host audio device "
-                    "is working properly. Check the logfile for error messages of the audio "
-                    "subsystem"), szMissingStreams);
+                bool fWarn = false;
+
+                PDMAUDIOBACKENDCFG backendCfg;
+                int rc2 = pCon->pfnGetConfiguration(pCon, &backendCfg);
+                if (RT_SUCCESS(rc2))
+                {
+                    if (backendCfg.cMaxHstStrmsIn)
+                    {
+                        /* If the audio backend supports two or more input streams at once,
+                         * warn if one of our two inputs (microphone-in and line-in) failed to initialize. */
+                        if (backendCfg.cMaxHstStrmsIn >= 2)
+                            fWarn = !fValidLineIn || !fValidMicIn;
+                        /* If the audio backend only supports one input stream at once (e.g. pure ALSA, and
+                         * *not* ALSA via PulseAudio plugin!), only warn if both of our inputs failed to initialize.
+                         * One of the two simply is not in use then. */
+                        else if (backendCfg.cMaxHstStrmsIn == 1)
+                            fWarn = !fValidLineIn && !fValidMicIn;
+                        /* Don't warn if our backend is not able of supporting any input streams at all. */
+                    }
+
+                    if (   !fWarn
+                        && backendCfg.cMaxHstStrmsOut)
+                    {
+                        fWarn = !fValidOut;
+                    }
+                }
+                else
+                    AssertReleaseMsgFailed(("Unable to retrieve audio backend configuration for LUN #%RU8, rc=%Rrc\n",
+                                            pDrv->uLUN, rc2));
+
+                if (fWarn)
+                {
+                    char   szMissingStreams[255];
+                    size_t len = 0;
+                    if (!fValidLineIn)
+                    {
+                        LogRel(("AC97: WARNING: Unable to open PCM line input for LUN #%RU8!\n", pDrv->uLUN));
+                        len = RTStrPrintf(szMissingStreams, sizeof(szMissingStreams), "PCM Input");
+                    }
+                    if (!fValidMicIn)
+                    {
+                        LogRel(("AC97: WARNING: Unable to open PCM microphone input for LUN #%RU8!\n", pDrv->uLUN));
+                        len += RTStrPrintf(szMissingStreams + len,
+                                           sizeof(szMissingStreams) - len, len ? ", PCM Microphone" : "PCM Microphone");
+                    }
+                    if (!fValidOut)
+                    {
+                        LogRel(("AC97: WARNING: Unable to open PCM output for LUN #%RU8!\n", pDrv->uLUN));
+                        len += RTStrPrintf(szMissingStreams + len,
+                                           sizeof(szMissingStreams) - len, len ? ", PCM Output" : "PCM Output");
+                    }
+
+                    PDMDevHlpVMSetRuntimeError(pDevIns, 0 /*fFlags*/, "HostAudioNotResponding",
+                                               N_("Some AC'97 audio streams (%s) could not be opened. Guest applications generating audio "
+                                                  "output or depending on audio input may hang. Make sure your host audio device "
+                                                  "is working properly. Check the logfile for error messages of the audio "
+                                                  "subsystem"), szMissingStreams);
+                }
             }
         }

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

@@ -4419 +4419 @@
     }
     else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
-    {
         LogFunc(("No attached driver for LUN #%u\n", uLUN));
-    }
-    else if (RT_FAILURE(rc))
-        AssertMsgFailed(("Failed to attach HDA LUN #%u (\"%s\"), rc=%Rrc\n",
-                        uLUN, pszDesc, rc));
 
     if (RT_FAILURE(rc))
@@ -4783 +4778 @@
             AssertPtr(pCon);
 
-            uint8_t cFailed = 0;
-            if (!pCon->pfnIsValidIn (pCon, pDrv->LineIn.pStrmIn))
-                cFailed++;
+            bool fValidLineIn = pCon->pfnIsValidIn(pCon, pDrv->LineIn.pStrmIn);
 #ifdef VBOX_WITH_HDA_MIC_IN
-            if (!pCon->pfnIsValidIn (pCon, pDrv->MicIn.pStrmIn))
-                cFailed++;
-#endif
-            if (!pCon->pfnIsValidOut(pCon, pDrv->Out.pStrmOut))
-                cFailed++;
-
+            bool fValidMicIn  = pCon->pfnIsValidIn (pCon, pDrv->MicIn.pStrmIn);
+#endif
+            bool fValidOut    = pCon->pfnIsValidOut(pCon, pDrv->Out.pStrmOut);
+
+            if (    !fValidLineIn
 #ifdef VBOX_WITH_HDA_MIC_IN
-            if (cFailed == 3)
-#else
-            if (cFailed == 2)
-#endif
+                 && !fValidMicIn
+#endif
+                 && !fValidOut)
             {
                 LogRel(("HDA: Falling back to NULL backend (no sound audible)\n"));
@@ -4808 +4799 @@
                        "with the consequence that no sound is audible"));
             }
-            else if (cFailed)
+            else
             {
-                if (!pDrv->pConnector->pfnIsValidIn (pDrv->pConnector, pDrv->LineIn.pStrmIn))
-                    LogRel(("HDA: WARNING: Unable to open PCM line input for LUN #%RU32!\n",       pDrv->uLUN));
+                bool fWarn = false;
+
+                PDMAUDIOBACKENDCFG backendCfg;
+                int rc2 = pCon->pfnGetConfiguration(pCon, &backendCfg);
+                if (RT_SUCCESS(rc2))
+                {
+                    if (backendCfg.cMaxHstStrmsIn)
+                    {
 #ifdef VBOX_WITH_HDA_MIC_IN
-                if (!pDrv->pConnector->pfnIsValidIn (pDrv->pConnector, pDrv->MicIn.pStrmIn))
-                    LogRel(("HDA: WARNING: Unable to open PCM microphone input for LUN #%RU32!\n", pDrv->uLUN));
-#endif
-                if (!pDrv->pConnector->pfnIsValidOut(pDrv->pConnector, pDrv->Out.pStrmOut))
-                    LogRel(("HDA: WARNING: Unable to open PCM output for LUN #%RU32!\n",           pDrv->uLUN));
-
-                char   szMissingStreams[255];
-                size_t len = 0;
-                if (!pCon->pfnIsValidIn (pCon, pDrv->LineIn.pStrmIn))
-                    len = RTStrPrintf(szMissingStreams,
-                                      sizeof(szMissingStreams), "PCM Input");
+                        /* If the audio backend supports two or more input streams at once,
+                         * warn if one of our two inputs (microphone-in and line-in) failed to initialize. */
+                        if (backendCfg.cMaxHstStrmsIn >= 2)
+                            fWarn = !fValidLineIn || !fValidMicIn;
+                        /* If the audio backend only supports one input stream at once (e.g. pure ALSA, and
+                         * *not* ALSA via PulseAudio plugin!), only warn if both of our inputs failed to initialize.
+                         * One of the two simply is not in use then. */
+                        else if (backendCfg.cMaxHstStrmsIn == 1)
+                            fWarn = !fValidLineIn && !fValidMicIn;
+                        /* Don't warn if our backend is not able of supporting any input streams at all. */
+#else
+                        /* We only have line-in as input source. */
+                        fWarn = !fValidLineIn;
+#endif
+                    }
+
+                    if (   !fWarn
+                        && backendCfg.cMaxHstStrmsOut)
+                    {
+                        fWarn = !fValidOut;
+                    }
+                }
+                else
+                    AssertReleaseMsgFailed(("Unable to retrieve audio backend configuration for LUN #%RU8, rc=%Rrc\n",
+                                            pDrv->uLUN, rc2));
+
+                if (fWarn)
+                {
+                    char   szMissingStreams[255];
+                    size_t len = 0;
+                    if (!fValidLineIn)
+                    {
+                        LogRel(("HDA: WARNING: Unable to open PCM line input for LUN #%RU8!\n", pDrv->uLUN));
+                        len = RTStrPrintf(szMissingStreams, sizeof(szMissingStreams), "PCM Input");
+                    }
 #ifdef VBOX_WITH_HDA_MIC_IN
-                if (!pCon->pfnIsValidIn (pCon, pDrv->MicIn.pStrmIn))
-                    len += RTStrPrintf(szMissingStreams + len,
-                                       sizeof(szMissingStreams) - len, len ? ", PCM Microphone" : "PCM Microphone");
-#endif
-                if (!pCon->pfnIsValidOut(pCon, pDrv->Out.pStrmOut))
-                    len += RTStrPrintf(szMissingStreams + len,
-                                       sizeof(szMissingStreams) - len, len ? ", PCM Output" : "PCM Output");
-
-                PDMDevHlpVMSetRuntimeError(pDevIns, 0 /*fFlags*/, "HostAudioNotResponding",
-                    N_("Some HDA audio streams (%s) could not be opened. Guest applications generating audio "
-                    "output or depending on audio input may hang. Make sure your host audio device "
-                    "is working properly. Check the logfile for error messages of the audio "
-                    "subsystem"), szMissingStreams);
+                    if (!fValidMicIn)
+                    {
+                        LogRel(("HDA: WARNING: Unable to open PCM microphone input for LUN #%RU8!\n", pDrv->uLUN));
+                        len += RTStrPrintf(szMissingStreams + len,
+                                           sizeof(szMissingStreams) - len, len ? ", PCM Microphone" : "PCM Microphone");
+                    }
+#endif
+                    if (!fValidOut)
+                    {
+                        LogRel(("HDA: WARNING: Unable to open PCM output for LUN #%RU8!\n", pDrv->uLUN));
+                        len += RTStrPrintf(szMissingStreams + len,
+                                           sizeof(szMissingStreams) - len, len ? ", PCM Output" : "PCM Output");
+                    }
+
+                    PDMDevHlpVMSetRuntimeError(pDevIns, 0 /*fFlags*/, "HostAudioNotResponding",
+                                               N_("Some HDA audio streams (%s) could not be opened. Guest applications generating audio "
+                                                  "output or depending on audio input may hang. Make sure your host audio device "
+                                                  "is working properly. Check the logfile for error messages of the audio "
+                                                  "subsystem"), szMissingStreams);
+                }
             }
         }

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

@@ -2317 +2317 @@
         AssertPtr(pCon);
 
-        uint8_t cFailed = 0;
-        if (!pCon->pfnIsValidOut(pCon, pDrv->Out.pStrmOut))
-            cFailed++;
-
-        if (cFailed)
+        /* Note: No input streams available for SB16 yet. */
+        bool fValidOut = pCon->pfnIsValidOut(pCon, pDrv->Out.pStrmOut);
+        if (fValidOut)
         {
             LogRel(("SB16: Falling back to NULL backend (no sound audible)\n"));

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

@@ -8 +8 @@
 
 /*
- * Copyright (C) 2006-2015 Oracle Corporation
+ * Copyright (C) 2006-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -1636 +1636 @@
 
     uint32_t cMaxHstStrmsOut = pThis->BackendCfg.cMaxHstStrmsOut;
-    uint32_t cbHstStrmsOut = pThis->BackendCfg.cbStreamOut;
+    uint32_t cbHstStrmsOut   = pThis->BackendCfg.cbStreamOut;
 
     if (cbHstStrmsOut)
     {
-        pThis->cFreeOutputStreams = 1; /** @todo Make this configurable. */
-        if (pThis->cFreeOutputStreams > cMaxHstStrmsOut)
-        {
-            LogRel(("Audio: Warning: %RU32 output streams were requested, host driver only supports %RU32\n",
-                    pThis->cFreeOutputStreams, cMaxHstStrmsOut));
-            pThis->cFreeOutputStreams = cMaxHstStrmsOut;
-        }
+        pThis->cFreeOutputStreams = cMaxHstStrmsOut;
     }
     else
@@ -1652 +1646 @@
 
     uint32_t cMaxHstStrmsIn = pThis->BackendCfg.cMaxHstStrmsIn;
-    uint32_t cbHstStrmIn = pThis->BackendCfg.cbStreamIn;
+    uint32_t cbHstStrmIn    = pThis->BackendCfg.cbStreamIn;
 
     if (cbHstStrmIn)
@@ -1658 +1652 @@
         /*
          * Note:
-         *  - Our AC'97 emulation has two inputs, line (P.IN) and microphone (P.MIC).
-         ** @todo Document HDA.
+         *  - Our AC'97 emulation has two inputs, line (ac97.pi) and microphone (ac97.mc).
+         *  - Our HDA emulation currently has only line input (hda.pi).
          */
-        pThis->cFreeInputStreams = 2; /** @todo Make this configurable. */
-        if (pThis->cFreeInputStreams > cMaxHstStrmsIn)
-        {
-            LogRel(("Audio: Warning: %RU32 input streams were requested, host driver only supports %RU32\n",
-                    pThis->cFreeInputStreams, cMaxHstStrmsIn));
-            pThis->cFreeInputStreams = cMaxHstStrmsIn;
-        }
+        pThis->cFreeInputStreams = cMaxHstStrmsIn;
     }
     else
@@ -1677 +1665 @@
     LogFlowFunc(("cFreeInputStreams=%RU8, cFreeOutputStreams=%RU8\n",
                  pThis->cFreeInputStreams, pThis->cFreeOutputStreams));
+
+    LogRel(("Audio: Host audio backend supports %RU32 output streams and %RU32 input streams at once\n",
+            /* Clamp for logging. Unlimited streams are defined by UINT32_MAX. */
+            RT_MIN(64, cMaxHstStrmsOut), RT_MIN(64, cMaxHstStrmsIn)));
 
     LogFlowFuncLeave();
@@ -2031 +2023 @@
         rc = drvAudioCreateStreamPairIn(pThis, pszName, enmRecSource, pCfg, &pGstStrmIn);
 
-    if (pGstStrmIn)
-        *ppGstStrmIn = pGstStrmIn;
+    if (RT_SUCCESS(rc))
+    {
+        if (pGstStrmIn)
+            *ppGstStrmIn = pGstStrmIn;
+    }
+    else
+    {
+        switch (rc)
+        {
+            case VERR_NO_MORE_HANDLES: /** @todo Find a better rc. */
+                LogRel(("Audio: Skipping to create input stream \"%s\", " \
+                        "as the host audio backend reached its maximum of concurrent audio input streams\n", pszName));
+                break;
+
+            default:
+                break;
+        }
+    }
 
     int rc2 = RTCritSectLeave(&pThis->CritSect);
@@ -2128 +2136 @@
     if (RT_SUCCESS(rc))
     {
-        AssertPtr(pGstStrmOut);
-        *ppGstStrmOut = pGstStrmOut;
+        if (pGstStrmOut)
+            *ppGstStrmOut = pGstStrmOut;
 #if 0
         /* Update remaining live samples with new rate. */
@@ -2145 +2153 @@
 #endif
     }
+    else
+    {
+        switch (rc)
+        {
+            case VERR_NO_MORE_HANDLES: /** @todo Find a better rc. */
+                LogRel(("Audio: Skipping to create output stream \"%s\", " \
+                        "as the host audio backend reached its maximum of concurrent audio output streams\n", pszName));
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    int rc2 = RTCritSectLeave(&pThis->CritSect);
+    if (RT_SUCCESS(rc))
+        rc = rc2;
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+static DECLCALLBACK(int) drvAudioGetConfiguration(PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOBACKENDCFG pCfg)
+{
+    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
+    AssertPtrReturn(pCfg,       VERR_INVALID_POINTER);
+
+    PDRVAUDIO pThis = PDMIAUDIOCONNECTOR_2_DRVAUDIO(pInterface);
+
+    int rc = RTCritSectEnter(&pThis->CritSect);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    memcpy(pCfg, &pThis->BackendCfg, sizeof(PDMAUDIOBACKENDCFG));
 
     int rc2 = RTCritSectLeave(&pThis->CritSect);
@@ -2310 +2352 @@
     pThis->IAudioConnector.pfnRead                   = drvAudioRead;
     pThis->IAudioConnector.pfnWrite                  = drvAudioWrite;
+    pThis->IAudioConnector.pfnGetConfiguration       = drvAudioGetConfiguration;
     pThis->IAudioConnector.pfnIsActiveIn             = drvAudioIsActiveIn;
     pThis->IAudioConnector.pfnIsActiveOut            = drvAudioIsActiveOut;

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

@@ -94 +94 @@
     /** List of host output streams. */
     RTLISTANCHOR            lstHstStrmOut;
-    /** Max. number of free input streams. */
-    uint8_t                 cFreeInputStreams;
-    /** Max. number of free output streams. */
-    uint8_t                 cFreeOutputStreams;
+    /** Max. number of free input streams.
+     *  UINT32_MAX for unlimited streams. */
+    uint32_t                cFreeInputStreams;
+    /** Max. number of free output streams.
+     *  UINT32_MAX for unlimited streams. */
+    uint32_t                cFreeOutputStreams;
     /** Audio configuration settings retrieved from the backend. */
     PDMAUDIOBACKENDCFG      BackendCfg;

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

@@ -171 +171 @@
     if (rc2)
     {
-        LogRel(("ALSA: Closing PCM descriptor failed: %s\n",
-                 snd_strerror(rc2)));
+        LogRel(("ALSA: Closing PCM descriptor failed: %s\n", snd_strerror(rc2)));
         rc = VERR_GENERAL_FAILURE; /** @todo */
     }
@@ -386 +385 @@
         if (!pszDev)
         {
-            LogRel(("ALSA: Invalid or no %s device name set\n",
-                    fIn ? "input" : "output"));
+            LogRel(("ALSA: Invalid or no %s device name set\n", fIn ? "input" : "output"));
             rc = VERR_INVALID_PARAMETER;
             break;
@@ -397 +395 @@
         if (err < 0)
         {
-            LogRel(("ALSA: Failed to open \"%s\" as %s: %s\n", pszDev,
-                    fIn ? "ADC" : "DAC", snd_strerror(err)));
+            LogRel(("ALSA: Failed to open \"%s\" as %s device: %s\n", pszDev, fIn ? "input" : "output", snd_strerror(err)));
             rc = VERR_AUDIO_BACKEND_INIT_FAILED;
             break;
         }
+
+        LogRel(("ALSA: Using %s device \"%s\"\n", fIn ? "input" : "output", pszDev));
 
         snd_pcm_hw_params_t *pHWParms;
@@ -408 +407 @@
         if (err < 0)
         {
-            LogRel(("ALSA: Failed to initialize hardware parameters: %s\n",
-                    snd_strerror(err)));
+            LogRel(("ALSA: Failed to initialize hardware parameters: %s\n", snd_strerror(err)));
             rc = VERR_AUDIO_BACKEND_INIT_FAILED;
             break;
@@ -426 +424 @@
         if (err < 0)
         {
-            LogRel(("ALSA: Failed to set audio format to %d: %s\n",
-                    pCfgReq->fmt, snd_strerror(err)));
+            LogRel(("ALSA: Failed to set audio format to %d: %s\n", pCfgReq->fmt, snd_strerror(err)));
             rc = VERR_AUDIO_BACKEND_INIT_FAILED;
             break;
@@ -435 +432 @@
         if (err < 0)
         {
-            LogRel(("ALSA: Failed to set frequency to %dHz: %s\n",
-                    pCfgReq->freq, snd_strerror(err)));
+            LogRel(("ALSA: Failed to set frequency to %uHz: %s\n", pCfgReq->freq, snd_strerror(err)));
             rc = VERR_AUDIO_BACKEND_INIT_FAILED;
             break;
@@ -706 +702 @@
     if (err < 0)
     {
-        LogFunc(("Failed to recover stream %p: %s\n",
-                 phPCM, snd_strerror(err)));
+        LogFunc(("Failed to recover stream %p: %s\n", phPCM, snd_strerror(err)));
         return VERR_ACCESS_DENIED; /** @todo Find a better rc. */
     }
@@ -721 +716 @@
     if (err < 0)
     {
-        LogFunc(("Failed to resume stream %p: %s\n",
-                 phPCM, snd_strerror(err)));
+        LogFunc(("Failed to resume stream %p: %s\n", phPCM, snd_strerror(err)));
         return VERR_ACCESS_DENIED; /** @todo Find a better rc. */
     }
@@ -737 +731 @@
         if (err < 0)
         {
-            LogFlow(("Error stopping stream %p: %s\n",
-                     phPCM, snd_strerror(err)));
+            LogRel(("ALSA: Error stopping stream %p: %s\n", phPCM, snd_strerror(err)));
             return VERR_ACCESS_DENIED;
         }
@@ -744 +737 @@
     else
     {
-        err = snd_pcm_prepare (phPCM);
+        err = snd_pcm_prepare(phPCM);
         if (err < 0)
         {
-            LogFlow(("Error preparing stream %p: %s\n",
-                     phPCM, snd_strerror(err)));
+            LogRel(("ALSA: Error preparing stream %p: %s\n", phPCM, snd_strerror(err)));
             return VERR_ACCESS_DENIED;
         }
@@ -856 +848 @@
 
                 case -EAGAIN:
+                {
                     /*
                      * Don't set error here because EAGAIN means there are no further frames
@@ -863 +856 @@
                     cbToRead = 0;
                     break;
+                }
 
                 case -EPIPE:
@@ -875 +869 @@
 
                 default:
+                {
                     LogFunc(("Failed to read input frames: %s\n", snd_strerror(cRead)));
-                    rc = VERR_AUDIO_BACKEND_INIT_FAILED;
-                    VERR_GENERAL_FAILURE; /** @todo Fudge! */
+                    rc = VERR_GENERAL_FAILURE; /** @todo Fudge! */
                     break;
+                }
             }
         }
@@ -1295 +1290 @@
     AssertPtrReturn(pCfg, VERR_INVALID_POINTER);
 
-    pCfg->cbStreamOut = sizeof(ALSAAUDIOSTREAMOUT);
-    pCfg->cbStreamIn = sizeof(ALSAAUDIOSTREAMIN);
-    pCfg->cMaxHstStrmsOut = INT_MAX;
-    pCfg->cMaxHstStrmsIn = INT_MAX;
+    pCfg->cbStreamIn      = sizeof(ALSAAUDIOSTREAMIN);
+    pCfg->cbStreamOut     = sizeof(ALSAAUDIOSTREAMOUT);
+
+    /* ALSA only allows one input and one output used at a time for
+     * the selected device. */
+    pCfg->cMaxHstStrmsIn  = 1;
+    pCfg->cMaxHstStrmsOut = 1;
 
     return VINF_SUCCESS;

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010-2015 Oracle Corporation
+ * Copyright (C) 2010-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2015 Oracle Corporation
+ * Copyright (C) 2006-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2015 Oracle Corporation
+ * Copyright (C) 2006-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -1102 +1102 @@
     AssertPtrReturn(pCfg, VERR_INVALID_POINTER);
 
-    pCfg->cbStreamOut = sizeof(PULSEAUDIOSTREAM);
-    pCfg->cbStreamIn = sizeof(PULSEAUDIOSTREAM);
-    pCfg->cMaxHstStrmsOut = INT_MAX;
-    pCfg->cMaxHstStrmsIn = INT_MAX;
+    pCfg->cbStreamOut     = sizeof(PULSEAUDIOSTREAM);
+    pCfg->cbStreamIn      = sizeof(PULSEAUDIOSTREAM);
+    pCfg->cMaxHstStrmsOut = UINT32_MAX;
+    pCfg->cMaxHstStrmsIn  = UINT32_MAX;
 
     return VINF_SUCCESS;