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

Timestamp:

Feb 4, 2021 11:47:45 AM (4 years ago)

Author:

vboxsync

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

142639

Message:

Audio/HDA: Make sure that unsupported guest speaker setups (> 2) also fall back to the right Hz rate (unless VBOX_WITH_AUDIO_HDA_51_SURROUND is set).

File:

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

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

@@ -285 +285 @@
                                    VERR_INVALID_PARAMETER);
 
-    /*
-     * Set the stream's timer Hz rate, based on the stream channel count.
-     * Currently this is just a rough guess and we might want to optimize this further.
-     *
-     * In any case, more channels per SDI/SDO means that we have to drive data more frequently.
-     */
-    if (pThis->uTimerHz == HDA_TIMER_HZ_DEFAULT) /* Make sure that we don't have any custom Hz rate set we want to enforce */
-    {
-        if (Props.cChannels >= 5)
-            pStreamShared->State.uTimerHz = 300;
-        else if (Props.cChannels == 4)
-            pStreamShared->State.uTimerHz = 150;
-        else
-            pStreamShared->State.uTimerHz = 100;
-    }
-    else
-        pStreamShared->State.uTimerHz = pThis->uTimerHz;
-
 #ifndef VBOX_WITH_AUDIO_HDA_51_SURROUND
     if (Props.cChannels > 2)
@@ -318 +300 @@
     }
 #endif
+
+    /*
+     * Set the stream's timer Hz rate, based on the stream channel count.
+     * Currently this is just a rough guess and we might want to optimize this further.
+     *
+     * In any case, more channels per SDI/SDO means that we have to drive data more frequently.
+     */
+    if (pThis->uTimerHz == HDA_TIMER_HZ_DEFAULT) /* Make sure that we don't have any custom Hz rate set we want to enforce */
+    {
+        if (Props.cChannels >= 5)
+            pStreamShared->State.uTimerHz = 300;
+        else if (Props.cChannels == 4)
+            pStreamShared->State.uTimerHz = 150;
+        else
+            pStreamShared->State.uTimerHz = 100;
+    }
+    else
+        pStreamShared->State.uTimerHz = pThis->uTimerHz;
 
     /* Did some of the vital / critical parameters change?