Changeset 61001 in vbox for trunk/src/VBox/Devices

Timestamp:

May 17, 2016 12:53:55 PM (9 years ago)

Author:

vboxsync

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

107254

Message:

Devices/Audio/DevIchHdaCodec.cpp: Relaxed checks when creating (non-available) default audio streams.

File:

• trunk/src/VBox/Devices/Audio/DevIchHdaCodec.cpp (modified) (5 diffs)

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

@@ -3213 +3213 @@
         strmCfg.enmEndianness = PDMAUDIOHOSTENDIANNESS;
 
+        /* Note: Adding the default input/output streams is *not* critical for the overall
+         *       codec construction result. */
+
         /*
          * Output streams.
@@ -3221 +3224 @@
         RTStrPrintf(strmCfg.szName, RT_ELEMENTS(strmCfg.szName), "Front");
         strmCfg.DestSource.Dest = PDMAUDIOPLAYBACKDEST_FRONT;
-        rc = hdaCodecAddStream(pThis, PDMAUDIOMIXERCTL_FRONT, &strmCfg);
-        AssertRCBreak(rc);
+        int rc2 = hdaCodecAddStream(pThis, PDMAUDIOMIXERCTL_FRONT, &strmCfg);
+        if (RT_FAILURE(rc2))
+            LogRel2(("HDA: Failed to add front output stream: %Rrc\n", rc2));
 
 #ifdef VBOX_WITH_HDA_51_SURROUND
@@ -3229 +3233 @@
         strmCfg.DestSource.Dest = PDMAUDIOPLAYBACKDEST_CENTER_LFE;
         /** @todo Handle mono channel if only center *or* LFE is available? */
-        rc = hdaCodecAddStream(pThis, PDMAUDIOMIXERCTL_CENTER_LFE, &strmCfg);
-        AssertRCBreak(rc);
+        rc2 = hdaCodecAddStream(pThis, PDMAUDIOMIXERCTL_CENTER_LFE, &strmCfg);
+        if (RT_FAILURE(rc2))
+            LogRel2(("HDA: Failed to add center/LFE output stream: %Rrc\n", rc2));
 
         /* Rear. */
         RTStrPrintf(strmCfg.szName, RT_ELEMENTS(strmCfg.szName), "Rear");
         strmCfg.DestSource.Dest = PDMAUDIOPLAYBACKDEST_REAR;
-        rc = hdaCodecAddStream(pThis, PDMAUDIOMIXERCTL_REAR, &strmCfg);
-        AssertRCBreak(rc);
+        rc2 = hdaCodecAddStream(pThis, PDMAUDIOMIXERCTL_REAR, &strmCfg);
+        if (RT_FAILURE(rc2))
+            LogRel2(("HDA: Failed to add rear output stream: %Rrc\n", rc2));
 #endif
 
@@ -3247 +3253 @@
         RTStrPrintf(strmCfg.szName, RT_ELEMENTS(strmCfg.szName), "Microphone In");
         strmCfg.DestSource.Source = PDMAUDIORECSOURCE_MIC;
-        rc = hdaCodecAddStream(pThis, PDMAUDIOMIXERCTL_MIC_IN, &strmCfg);
-        AssertRCBreak(rc);
+        rc2 = hdaCodecAddStream(pThis, PDMAUDIOMIXERCTL_MIC_IN, &strmCfg);
+        if (RT_FAILURE(rc2))
+            LogRel2(("HDA: Failed to add microphone input stream: %Rrc\n", rc2));
 #endif
         RTStrPrintf(strmCfg.szName, RT_ELEMENTS(strmCfg.szName), "Line In");
         strmCfg.DestSource.Source = PDMAUDIORECSOURCE_LINE;
-        rc = hdaCodecAddStream(pThis, PDMAUDIOMIXERCTL_LINE_IN, &strmCfg);
-        AssertRCBreak(rc);
+        rc2 = hdaCodecAddStream(pThis, PDMAUDIOMIXERCTL_LINE_IN, &strmCfg);
+        if (RT_FAILURE(rc2))
+            LogRel2(("HDA: Failed to add line input stream: %Rrc\n", rc2));
 
     } while (0);
-
-    /** @todo Handle rc here? */
 
     /*
@@ -3277 +3283 @@
 #endif
 
-    return VINF_SUCCESS;
-}
-
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+