Changeset 74903 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Oct 18, 2018 7:59:50 AM (6 years ago)

Author:

vboxsync

Message:

Main/WebMWriter: Added some more checks for WebMWriter::AddAudioTrack().

File:

• trunk/src/VBox/Main/src-client/WebMWriter.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/WebMWriter.cpp

@@ -180 +180 @@
 {
 #ifdef VBOX_WITH_LIBOPUS
-    int rc;
+    AssertReturn(uHz,       VERR_INVALID_PARAMETER);
+    AssertReturn(cBits,     VERR_INVALID_PARAMETER);
+    AssertReturn(cChannels, VERR_INVALID_PARAMETER);
 
     /*
-     * Check if the requested codec rate is supported.
+     * Adjust the handed-in Hz rate to values which are supported by the Opus codec.
      *
      * Only the following values are supported by an Opus standard build
      * -- every other rate only is supported by a custom build.
+     *
+     * See opus_encoder_create() for more information.
      */
-    switch (uHz)
-    {
-        case 48000:
-        case 24000:
-        case 16000:
-        case 12000:
-        case  8000:
-            rc = VINF_SUCCESS;
-            break;
-
-        default:
-            rc = VERR_NOT_SUPPORTED;
-            break;
-    }
-
-    if (RT_FAILURE(rc))
-        return rc;
+    if      (uHz > 24000) uHz = 48000;
+    else if (uHz > 16000) uHz = 24000;
+    else if (uHz > 12000) uHz = 16000;
+    else if (uHz > 8000 ) uHz = 12000;
+    else     uHz = 8000;
 
     /* Some players (e.g. Firefox with Nestegg) rely on track numbers starting at 1.