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

Timestamp:

Jun 9, 2021 2:10:21 PM (4 years ago)

Author:

vboxsync

Message:

DrvAudio: Fixed missing pre-buffer allocation alignment for some odd situations. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (modified) (1 diff)

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

@@ -1618 +1618 @@
         if (pStreamEx->Core.Cfg.Backend.cFramesPreBuffering != 0)
         {
-            pStreamEx->Out.cbPreBufAlloc     = PDMAudioPropsFramesToBytes(&pStreamEx->Core.Cfg.Props,
-                                                                          pStreamEx->Core.Cfg.Backend.cFramesBufferSize - 2);
-            pStreamEx->Out.cbPreBufAlloc     = RT_MIN(RT_ALIGN_32(pStreamEx->cbPreBufThreshold + _8K, _4K),
-                                                      pStreamEx->Out.cbPreBufAlloc);
-            pStreamEx->Out.pbPreBuf          = (uint8_t *)RTMemAllocZ(pStreamEx->Out.cbPreBufAlloc);
+            uint32_t cbPreBufAlloc = PDMAudioPropsFramesToBytes(&pStreamEx->Core.Cfg.Props,
+                                                                pStreamEx->Core.Cfg.Backend.cFramesBufferSize);
+            cbPreBufAlloc = RT_MIN(RT_ALIGN_32(pStreamEx->cbPreBufThreshold + _8K, _4K), cbPreBufAlloc);
+            cbPreBufAlloc = PDMAudioPropsFloorBytesToFrame(&pStreamEx->Core.Cfg.Props, cbPreBufAlloc);
+            pStreamEx->Out.cbPreBufAlloc     = cbPreBufAlloc;
+            pStreamEx->Out.pbPreBuf          = (uint8_t *)RTMemAllocZ(cbPreBufAlloc);
             AssertReturn(pStreamEx->Out.pbPreBuf, VERR_NO_MEMORY);
         }