Changeset 76679 in vbox

Timestamp:

Jan 7, 2019 1:50:26 PM (6 years ago)

Author:

vboxsync

Message:

Audio/Common: DrvAudioHlpMilliToBytes() / DrvAudioHlpNanoToBytes(): Make sure to always return an audio-frame-aligned value.

File:

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

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

@@ -1320 +1320 @@
  * Returns the amount of bytes for a given time (in ms) and PCM properties.
  *
+ * Note: The result will return an amount of bytes which is aligned to the audio frame size.
+ *
  * @return  uint32_t            Calculated amount of bytes.
  * @param   uMs                 Time (in ms) to calculate amount of bytes for.
@@ -1331 +1333 @@
         return 0;
 
-    return ((double)drvAudioHlpBytesPerSec(pProps) / (double)RT_MS_1SEC) * uMs;
+    const uint32_t uBytesPerFrame = DrvAudioHlpPCMPropsBytesPerFrame(pProps);
+
+    uint32_t uBytes = ((double)drvAudioHlpBytesPerSec(pProps) / (double)RT_MS_1SEC) * uMs;
+    if (uBytes % uBytesPerFrame) /* Any remainder? Make the returned bytes an integral number to the given frames. */
+        uBytes = uBytes + (uBytesPerFrame - uBytes % uBytesPerFrame);
+
+    Assert(uBytes % uBytesPerFrame == 0); /* Paranoia. */
+
+    return uBytes;
 }
 
 /**
  * Returns the amount of bytes for a given time (in ns) and PCM properties.
+ *
+ * Note: The result will return an amount of bytes which is aligned to the audio frame size.
  *
  * @return  uint32_t            Calculated amount of bytes.
@@ -1348 +1360 @@
         return 0;
 
-    return ((double)drvAudioHlpBytesPerSec(pProps) / (double)RT_NS_1SEC) * uNs;
+    const uint32_t uBytesPerFrame = DrvAudioHlpPCMPropsBytesPerFrame(pProps);
+
+    uint32_t uBytes = ((double)drvAudioHlpBytesPerSec(pProps) / (double)RT_NS_1SEC) * uNs;
+    if (uBytes % uBytesPerFrame) /* Any remainder? Make the returned bytes an integral number to the given frames. */
+        uBytes = uBytes + (uBytesPerFrame - uBytes % uBytesPerFrame);
+
+    Assert(uBytes % uBytesPerFrame == 0); /* Paranoia. */
+
+    return uBytes;
 }