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

Timestamp:

May 24, 2016 6:12:08 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

107463

Message:

Audio: Bugfixes.

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixer.cpp (modified) (2 diffs)
• DrvAudio.cpp (modified) (2 diffs)
• DrvAudioCommon.cpp (modified) (1 diff)

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

@@ -392 +392 @@
     AssertRCReturn(rc, rc);
 
+    /* Apply the sink's direction for the configuration to use to
+     * create the stream. */
+    if (pSink->enmDir == AUDMIXSINKDIR_INPUT)
+    {
+        CfgSink.DestSource.Source = PDMAUDIORECSOURCE_UNKNOWN;
+        CfgSink.enmDir            = PDMAUDIODIR_IN;
+    }
+    else
+    {
+        CfgSink.DestSource.Dest = PDMAUDIOPLAYBACKDEST_UNKNOWN;
+        CfgSink.enmDir          = PDMAUDIODIR_OUT;
+    }
+
     /* Always use the sink's PCM audio format as the host side when creating a stream for it. */
     PPDMAUDIOSTREAM pStream;
@@ -968 +981 @@
 bool AudioMixerStreamIsActive(PAUDMIXSTREAM pMixStream)
 {
+    if (   !pMixStream
+        && !pMixStream->pConn)
+    {
+        return false;
+    }
+
+    bool fIsActive =
+        (pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTRMSTS_FLAG_ENABLED);
+
+    return fIsActive;
+}
+
+bool AudioMixerStreamIsValid(PAUDMIXSTREAM pMixStream)
+{
     if (!pMixStream)
         return false;
 
-    return (pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTRMSTS_FLAG_ENABLED);
-}
-
-bool AudioMixerStreamIsValid(PAUDMIXSTREAM pMixStream)
-{
-    if (!pMixStream)
-        return false;
-
     uint32_t fStatus = pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream);
 

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

@@ -1497 +1497 @@
         /* Make sure that both configurations actually intend the same thing. */
         if (pCfgHost->enmDir != pCfgGuest->enmDir)
+        {
+            AssertMsgFailed(("Stream configuration directions do not match\n"));
             RC_BREAK(VERR_INVALID_PARAMETER);
+        }
 
         /* Note: cbHstStrm will contain sizeof(PDMAUDIOSTREAM) + additional data
@@ -1610 +1613 @@
     if (RT_FAILURE(rc))
     {
-        if (pHstStrm->enmCtx == PDMAUDIOSTREAMCTX_HOST)
+        if (   pHstStrm
+            && pHstStrm->enmCtx == PDMAUDIOSTREAMCTX_HOST)
         {
             if (pHstStrm->fStatus & PDMAUDIOSTRMSTS_FLAG_INITIALIZED)

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

@@ -174 +174 @@
     switch (enmRecSrc)
     {
-        case PDMAUDIORECSOURCE_MIC:   return "Microphone In";
-        case PDMAUDIORECSOURCE_CD:    return "CD";
-        case PDMAUDIORECSOURCE_VIDEO: return "Video";
-        case PDMAUDIORECSOURCE_AUX:   return "AUX";
-        case PDMAUDIORECSOURCE_LINE:  return "Line In";
-        case PDMAUDIORECSOURCE_PHONE: return "Phone";
+        case PDMAUDIORECSOURCE_UNKNOWN: return "Unknown";
+        case PDMAUDIORECSOURCE_MIC:     return "Microphone In";
+        case PDMAUDIORECSOURCE_CD:      return "CD";
+        case PDMAUDIORECSOURCE_VIDEO:   return "Video";
+        case PDMAUDIORECSOURCE_AUX:     return "AUX";
+        case PDMAUDIORECSOURCE_LINE:    return "Line In";
+        case PDMAUDIORECSOURCE_PHONE:   return "Phone";
         default:
             break;