Changeset 89564 in vbox

Timestamp:

Jun 8, 2021 9:24:27 AM (4 years ago)

Author:

vboxsync

Message:

DrvAudio: Change the default for cFramesPeriod to be 1/4 of the buffer size instead of a fixed 150ms. Don't fail on misconfigured period/buffer/pre-buffer size relationships, just adjust and continue. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (modified) (4 diffs)

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

@@ -1091 +1091 @@
 
     /*
+     * Buffer size
+     */
+    const char *pszWhat = "device-specific";
+    if (pDrvCfg->uBufferSizeMs)
+    {
+        pCfg->Backend.cFramesBufferSize = PDMAudioPropsMilliToFrames(&pCfg->Props, pDrvCfg->uBufferSizeMs);
+        pszWhat = "custom";
+    }
+
+    if (!pCfg->Backend.cFramesBufferSize) /* Set default buffer size if nothing explicitly is set. */
+    {
+        pCfg->Backend.cFramesBufferSize = PDMAudioPropsMilliToFrames(&pCfg->Props, 300 /*ms*/);
+        pszWhat = "default";
+    }
+
+    LogRel2(("Audio: Using %s buffer size %RU64 ms / %RU32 frames for stream '%s'\n",
+             pszWhat, PDMAudioPropsFramesToMilli(&pCfg->Props, pCfg->Backend.cFramesBufferSize),
+             pCfg->Backend.cFramesBufferSize, pszName));
+
+    /*
      * Period size
      */
-    const char *pszWhat = "device-specific";
+    pszWhat = "device-specific";
     if (pDrvCfg->uPeriodSizeMs)
     {
@@ -1102 +1122 @@
     if (!pCfg->Backend.cFramesPeriod) /* Set default period size if nothing explicitly is set. */
     {
-        pCfg->Backend.cFramesPeriod = PDMAudioPropsMilliToFrames(&pCfg->Props, 150 /*ms*/);
+        pCfg->Backend.cFramesPeriod = pCfg->Backend.cFramesBufferSize / 4;
         pszWhat = "default";
+    }
+
+    if (pCfg->Backend.cFramesPeriod >= pCfg->Backend.cFramesBufferSize / 2)
+    {
+        LogRel(("Audio: Warning! Stream '%s': The stream period size (%RU64ms, %s) cannot be more than half the buffer size (%RU64ms)!\n",
+                pszName, PDMAudioPropsFramesToMilli(&pCfg->Props, pCfg->Backend.cFramesPeriod), pszWhat,
+                PDMAudioPropsFramesToMilli(&pCfg->Props, pCfg->Backend.cFramesBufferSize)));
+        pCfg->Backend.cFramesPeriod = pCfg->Backend.cFramesBufferSize / 2;
     }
 
@@ -1109 +1137 @@
              pszWhat, PDMAudioPropsFramesToMilli(&pCfg->Props, pCfg->Backend.cFramesPeriod),
              pCfg->Backend.cFramesPeriod, pszName));
-
-    /*
-     * Buffer size
-     */
-    pszWhat = "device-specific";
-    if (pDrvCfg->uBufferSizeMs)
-    {
-        pCfg->Backend.cFramesBufferSize = PDMAudioPropsMilliToFrames(&pCfg->Props, pDrvCfg->uBufferSizeMs);
-        pszWhat = "custom";
-    }
-
-    if (!pCfg->Backend.cFramesBufferSize) /* Set default buffer size if nothing explicitly is set. */
-    {
-        pCfg->Backend.cFramesBufferSize = PDMAudioPropsMilliToFrames(&pCfg->Props, 300 /*ms*/);
-        pszWhat = "default";
-    }
-
-    LogRel2(("Audio: Using %s buffer size %RU64 ms / %RU32 frames for stream '%s'\n",
-             pszWhat, PDMAudioPropsFramesToMilli(&pCfg->Props, pCfg->Backend.cFramesBufferSize),
-             pCfg->Backend.cFramesBufferSize, pszName));
 
     /*
@@ -1154 +1162 @@
     }
 
+    if (pCfg->Backend.cFramesPreBuffering >= pCfg->Backend.cFramesBufferSize)
+    {
+        LogRel(("Audio: Warning! Stream '%s': Pre-buffering (%RU64ms, %s) cannot equal or exceed the buffer size (%RU64ms)!\n",
+                pszName,  PDMAudioPropsFramesToMilli(&pCfg->Props, pCfg->Backend.cFramesBufferSize), pszWhat,
+                PDMAudioPropsFramesToMilli(&pCfg->Props, pCfg->Backend.cFramesPreBuffering) ));
+        pCfg->Backend.cFramesPreBuffering = pCfg->Backend.cFramesBufferSize - 1;
+    }
+
     LogRel2(("Audio: Using %s pre-buffering size %RU64 ms / %RU32 frames for stream '%s'\n",
              pszWhat, PDMAudioPropsFramesToMilli(&pCfg->Props, pCfg->Backend.cFramesPreBuffering),
              pCfg->Backend.cFramesPreBuffering, pszName));
-
-    /*
-     * Validate input.
-     */
-    if (pCfg->Backend.cFramesBufferSize < pCfg->Backend.cFramesPeriod)
-    {
-        LogRel(("Audio: Error for stream '%s': Buffering size (%RU64ms) must not be smaller than the period size (%RU64ms)\n",
-                pszName, PDMAudioPropsFramesToMilli(&pCfg->Props, pCfg->Backend.cFramesBufferSize),
-                PDMAudioPropsFramesToMilli(&pCfg->Props, pCfg->Backend.cFramesPeriod)));
-        return VERR_INVALID_PARAMETER;
-    }
-
-    if (   pCfg->Backend.cFramesPreBuffering != UINT32_MAX /* Custom pre-buffering set? */
-        && pCfg->Backend.cFramesPreBuffering)
-    {
-        if (pCfg->Backend.cFramesBufferSize < pCfg->Backend.cFramesPreBuffering)
-        {
-            LogRel(("Audio: Error for stream '%s': Buffering size (%RU64ms) must not be smaller than the pre-buffering size (%RU64ms)\n",
-                    pszName, PDMAudioPropsFramesToMilli(&pCfg->Props, pCfg->Backend.cFramesPreBuffering),
-                    PDMAudioPropsFramesToMilli(&pCfg->Props, pCfg->Backend.cFramesBufferSize)));
-            return VERR_INVALID_PARAMETER;
-        }
-    }
 
     return VINF_SUCCESS;