Changeset 73208 in vbox for trunk/src/VBox

Timestamp:

Jul 18, 2018 3:00:47 PM (6 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio: Don't use float / size_t in DrvAudioHlpBytesToMs() and DrvAudioHlpFramesToMs().

Location:

trunk/src/VBox/Devices/Audio

Files:

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

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

@@ -155 +155 @@
 uint32_t DrvAudioHlpCalcBitrate(const PPDMAUDIOPCMPROPS pProps);
 uint32_t DrvAudioHlpBytesToFrames(const PPDMAUDIOPCMPROPS pProps, uint32_t cbBytes);
-uint64_t DrvAudioHlpBytesToMs(const PPDMAUDIOPCMPROPS pProps, size_t cbBytes);
+uint64_t DrvAudioHlpBytesToMs(const PPDMAUDIOPCMPROPS pProps, uint32_t cbBytes);
 uint32_t DrvAudioHlpFramesToBytes(const PPDMAUDIOPCMPROPS pProps, uint32_t cFrames);
-float DrvAudioHlpFramesToMs(const PPDMAUDIOPCMPROPS pProps, size_t cFrames);
+uint64_t DrvAudioHlpFramesToMs(const PPDMAUDIOPCMPROPS pProps, uint32_t cFrames);
 uint32_t DrvAudioHlpMsToBytes(const PPDMAUDIOPCMPROPS pProps, uint32_t uMs);
 uint32_t DrvAudioHlpMsToFrames(const PPDMAUDIOPCMPROPS pProps, uint32_t uMs);

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

@@ -1084 +1084 @@
  * @param   cbBytes             Amount of bytes to calculate time for.
  */
-uint64_t DrvAudioHlpBytesToMs(const PPDMAUDIOPCMPROPS pProps, size_t cbBytes)
+uint64_t DrvAudioHlpBytesToMs(const PPDMAUDIOPCMPROPS pProps, uint32_t cbBytes)
 {
     AssertPtrReturn(pProps, 0);
@@ -1119 +1119 @@
  * Returns the time (in ms) for given audio frames amount and PCM properties.
  *
- * @return  float               Calculated time (in ms).
+ * @return  uint64_t            Calculated time (in ms).
  * @param   pProps              PCM properties to calculate time (in ms) for.
  * @param   cFrames             Amount of audio frames to calculate time for.
  */
-float DrvAudioHlpFramesToMs(const PPDMAUDIOPCMPROPS pProps, size_t cFrames)
+uint64_t DrvAudioHlpFramesToMs(const PPDMAUDIOPCMPROPS pProps, uint32_t cFrames)
 {
     AssertPtrReturn(pProps, 0);
@@ -1133 +1133 @@
         return 0;
 
-    return float(cFrames / (pProps->uHz / 1000 /* ms */));
+    return cFrames / (pProps->uHz / 1000 /* ms */);
 }