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

Timestamp:

Jun 16, 2021 1:48:45 PM (4 years ago)

Author:

vboxsync

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

145193

Message:

DevIchAc97: Addressed todo in ichac97R3StreamSetUp regarding zero rate, making it return VERR_OUT_OF_RANGE rather than VINF_SUCCESS and check for any unsupported uHz values. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (3 diffs)

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

@@ -2038 +2038 @@
     }
 
-    /** @todo r=bird: If uHz == 0 then we'll just keep the previous stream, so
-     * wonder how that's going to play out if the guest tries to enable it...  This
-     * makes no real sense.
-     *
-     * Comment your code and changes you make, please!  This is frigging tedious.
-     *
-     * Test added in r127402?  The test is older (before r118166, r113296, r112652,
-     * r112463, r107142), but it used to be placed after calling
-     * ichac97R3MixerRemoveDrvStreams() since r112652.  Till ~r112463 a zero uHz
-     * caused a VERR_INVALID_PARAMETER return. Before r107142 it would disable the
-     * stream if uHz was zero. */
-    if (Cfg.Props.uHz)
-    { /* likely */ }
-    else
-    {
-        LogFlowFunc(("[SD%RU8] Hz is zero!! skipping/ignoring\n", pStreamCC->u8SD));
-        return VINF_SUCCESS;
-    }
+    /*
+     * Don't continue if the frequency is out of range (the rest of the
+     * properties should be okay).
+     */
+    char szTmp[PDMAUDIOSTRMCFGTOSTRING_MAX];
+    ASSERT_GUEST_MSG_RETURN(AudioHlpStreamCfgIsValid(&Cfg),
+                            ("Invalid stream #%u rate: %s\n", pStreamCC->u8SD,
+                             PDMAudioStrmCfgToString(&Cfg, szTmp, sizeof(szTmp)) ),
+                            VERR_INVALID_PARAMETER);
 
     /*
@@ -2123 +2114 @@
         if (Cfg.Props.uHz > 44100) /* E.g. 48000 Hz. */
             uTimerHz = 200;
-        else /* Just take the global Hz rate otherwise. */
-            uTimerHz = pThis->uTimerHz;
+        else
+            uTimerHz = AC97_TIMER_HZ_DEFAULT;
     }
     else
@@ -2205 +2196 @@
      * Otherwise avoid this and just reuse it, as this costs performance.
      */
-    char szTmp[PDMAUDIOSTRMCFGTOSTRING_MAX];
     int rc = VINF_SUCCESS;
     if (   fForce