Changeset 73420 in vbox for trunk/src/VBox

Timestamp:

Aug 1, 2018 12:35:28 PM (6 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio: Misc fixes for the timing helper functions.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvAudio.h (modified) (1 diff)
• DrvAudioCommon.cpp (modified) (11 diffs)

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

@@ -192 +192 @@
 uint64_t DrvAudioHlpFramesToMilli(uint32_t cFrames, const PPDMAUDIOPCMPROPS pProps);
 uint64_t DrvAudioHlpFramesToNano(uint32_t cFrames, const PPDMAUDIOPCMPROPS pProps);
-uint32_t DrvAudioHlpMilliToBytes(uint32_t uMs, const PPDMAUDIOPCMPROPS pProps);
-uint32_t DrvAudioHlpNanoToBytes(uint32_t uNs, const PPDMAUDIOPCMPROPS pProps);
-uint32_t DrvAudioHlpMilliToFrames(uint32_t uMs, const PPDMAUDIOPCMPROPS pProps);
-uint32_t DrvAudioHlpNanoToFrames(uint32_t uNs, const PPDMAUDIOPCMPROPS pProps);
+uint32_t DrvAudioHlpMilliToBytes(uint64_t uMs, const PPDMAUDIOPCMPROPS pProps);
+uint32_t DrvAudioHlpNanoToBytes(uint64_t uNs, const PPDMAUDIOPCMPROPS pProps);
+uint32_t DrvAudioHlpMilliToFrames(uint64_t uMs, const PPDMAUDIOPCMPROPS pProps);
+uint32_t DrvAudioHlpNanoToFrames(uint64_t uNs, const PPDMAUDIOPCMPROPS pProps);
 /** @}  */
 

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

@@ -1127 +1127 @@
         return 0;
 
-    const float dbBytesPerMs = ((pProps->cBits / 8) * pProps->cChannels * pProps->uHz) / RT_MS_1SEC;
+    const uint64_t cbBytesPerSec = (pProps->cBits / 8) * pProps->cChannels * pProps->uHz;
+    const double dbBytesPerMs = (double)cbBytesPerSec / (double)RT_MS_1SEC;
     Assert(dbBytesPerMs >= 0.0f);
     if (!dbBytesPerMs) /* Prevent division by zero. */
         return 0;
 
-    return cbBytes / dbBytesPerMs;
+    return (double)cbBytes / (double)dbBytesPerMs;
 }
 
@@ -1149 +1150 @@
         return 0;
 
-    const float dbBytesPerMs = ((pProps->cBits / 8) * pProps->cChannels * pProps->uHz) / RT_NS_1SEC;
+    const double dbBytesPerMs = ((pProps->cBits / 8) * pProps->cChannels * pProps->uHz) / RT_NS_1SEC;
     Assert(dbBytesPerMs >= 0.0f);
     if (!dbBytesPerMs) /* Prevent division by zero. */
@@ -1171 +1172 @@
         return 0;
 
-    return cFrames * ((pProps->cBits / 8) * pProps->cChannels);
+    const uint32_t cbFrame = (pProps->cBits / 8) * pProps->cChannels;
+    return cFrames * cbFrame;
 }
 
@@ -1191 +1193 @@
         return 0;
 
-    return cFrames / (pProps->uHz / RT_MS_1SEC);
+    return cFrames / ((double)pProps->uHz / (double)RT_MS_1SEC);
 }
 
@@ -1211 +1213 @@
         return 0;
 
-    return cFrames / float(pProps->uHz / RT_NS_1SEC);
+    return cFrames / ((double)pProps->uHz / (double)RT_NS_1SEC);
 }
 
@@ -1221 +1223 @@
  * @param   pProps              PCM properties to calculate amount of bytes for.
  */
-uint32_t DrvAudioHlpMilliToBytes(uint32_t uMs, const PPDMAUDIOPCMPROPS pProps)
+uint32_t DrvAudioHlpMilliToBytes(uint64_t uMs, const PPDMAUDIOPCMPROPS pProps)
 {
     AssertPtrReturn(pProps, 0);
@@ -1228 +1230 @@
         return 0;
 
-    return float(((pProps->cBits / 8) * pProps->cChannels * pProps->uHz) / RT_MS_1SEC) * uMs;
+    const uint64_t cbBytesPerSec = (pProps->cBits / 8) * pProps->cChannels * pProps->uHz;
+    return ((double)cbBytesPerSec / (double)RT_MS_1SEC) * uMs;
 }
 
@@ -1238 +1241 @@
  * @param   pProps              PCM properties to calculate amount of bytes for.
  */
-uint32_t DrvAudioHlpNanoToBytes(uint32_t uNs, const PPDMAUDIOPCMPROPS pProps)
+uint32_t DrvAudioHlpNanoToBytes(uint64_t uNs, const PPDMAUDIOPCMPROPS pProps)
 {
     AssertPtrReturn(pProps, 0);
@@ -1245 +1248 @@
         return 0;
 
-    return float(((pProps->cBits / 8) * pProps->cChannels * pProps->uHz) / RT_NS_1SEC) * uNs;
+    const uint64_t cbBytesPerSec = (pProps->cBits / 8) * pProps->cChannels * pProps->uHz;
+    return ((double)cbBytesPerSec / (double)RT_NS_1SEC) * uNs;
 }
 
@@ -1255 +1259 @@
  * @param   pProps              PCM properties to calculate amount of frames for.
  */
-uint32_t DrvAudioHlpMilliToFrames(uint32_t uMs, const PPDMAUDIOPCMPROPS pProps)
+uint32_t DrvAudioHlpMilliToFrames(uint64_t uMs, const PPDMAUDIOPCMPROPS pProps)
 {
     AssertPtrReturn(pProps, 0);
@@ -1273 +1277 @@
  * @param   pProps              PCM properties to calculate amount of frames for.
  */
-uint32_t DrvAudioHlpNanoToFrames(uint32_t uNs, const PPDMAUDIOPCMPROPS pProps)
+uint32_t DrvAudioHlpNanoToFrames(uint64_t uNs, const PPDMAUDIOPCMPROPS pProps)
 {
     AssertPtrReturn(pProps, 0);