Changeset 87992 in vbox

Timestamp:

Mar 7, 2021 3:14:14 PM (4 years ago)

Author:

vboxsync

Message:

Audio: Switched DrvAudioHlpFramesToNano parameters. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvAudio.h (modified) (1 diff)
• DrvAudioCommon.cpp (modified) (2 diffs)
• testcase/tstAudioMixBuffer.cpp (modified) (1 diff)

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

@@ -206 +206 @@
 uint32_t DrvAudioHlpFramesToBytes(uint32_t cFrames, PCPDMAUDIOPCMPROPS pProps);
 uint64_t DrvAudioHlpFramesToMilli(uint32_t cFrames, PCPDMAUDIOPCMPROPS pProps);
-uint64_t DrvAudioHlpFramesToNano(uint32_t cFrames, PCPDMAUDIOPCMPROPS pProps);
+uint64_t DrvAudioHlpFramesToNano(PCPDMAUDIOPCMPROPS pProps, uint32_t cFrames);
 uint32_t DrvAudioHlpMilliToBytes(uint64_t uMs, PCPDMAUDIOPCMPROPS pProps);
 uint32_t DrvAudioHlpNanoToBytes(uint64_t uNs, PCPDMAUDIOPCMPROPS pProps);

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

@@ -1341 +1341 @@
 
 /**
- * Returns the time (in ms) for given audio frames amount and PCM properties.
- *
- * @return  uint64_t            Calculated time (in ms).
- * @param   cFrames             Amount of audio frames to calculate time for.
- * @param   pProps              PCM properties to calculate time (in ms) for.
+ * Converts frames to milliseconds.
+ *
+ * @returns milliseconds.
+ * @param   pProps      The PCM properties to use.
+ * @param   cFrames     Number of audio frames to convert.
  */
 uint64_t DrvAudioHlpFramesToMilli(uint32_t cFrames, PCPDMAUDIOPCMPROPS pProps)
@@ -1368 +1368 @@
 
 /**
- * Returns the time (in ns) for given audio frames amount and PCM properties.
- *
- * @return  uint64_t            Calculated time (in ns).
- * @param   cFrames             Amount of audio frames to calculate time for.
- * @param   pProps              PCM properties to calculate time (in ns) for.
- */
-uint64_t DrvAudioHlpFramesToNano(uint32_t cFrames, PCPDMAUDIOPCMPROPS pProps)
+ * Converts frames to nanoseconds.
+ *
+ * @returns Nanoseconds.
+ * @param   pProps      The PCM properties to use.
+ * @param   cFrames     Number of audio frames to convert.
+ */
+uint64_t DrvAudioHlpFramesToNano(PCPDMAUDIOPCMPROPS pProps, uint32_t cFrames)
 {
     AssertPtrReturn(pProps, 0);

trunk/src/VBox/Devices/Audio/testcase/tstAudioMixBuffer.cpp

@@ -64 +64 @@
 
 
-    RTTESTI_CHECK_MSG((u64 = DrvAudioHlpFramesToNano(44100, &s_Cfg441StereoS16)) == RT_NS_1SEC,
+    RTTESTI_CHECK_MSG((u64 = DrvAudioHlpFramesToNano(&s_Cfg441StereoS16, 44100)) == RT_NS_1SEC,
                       ("ns=%RU64\n", u64));
     //RTTESTI_CHECK_MSG((u64 = DrvAudioHlpFramesToMicro(44100, &s_Cfg441StereoS16)) == RT_US_1SEC,