Changeset 88003 in vbox

Timestamp:

Mar 8, 2021 11:46:08 AM (4 years ago)

Author:

vboxsync

Message:

Audio: DrvAudioHlpCalcBitrate -> DrvAudioHlpGetBitrate. bugref:9098

Location:

trunk/src/VBox/Devices/Audio

Files:

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

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

@@ -195 +195 @@
 /** @name Audio calculation helper methods.
  * @{ */
-void DrvAudioHlpClearBuf(PCPDMAUDIOPCMPROPS pPCMProps, void *pvBuf, size_t cbBuf, uint32_t cFrames);
+void     DrvAudioHlpClearBuf(PCPDMAUDIOPCMPROPS pPCMProps, void *pvBuf, size_t cbBuf, uint32_t cFrames);
 uint32_t DrvAudioHlpCalcBitrate(uint8_t cBits, uint32_t uHz, uint8_t cChannels);
-uint32_t DrvAudioHlpCalcBitrate(PCPDMAUDIOPCMPROPS pProps);
+uint32_t DrvAudioHlpGetBitrate(PCPDMAUDIOPCMPROPS pProps);
 uint32_t DrvAudioHlpBytesAlign(uint32_t cbSize, PCPDMAUDIOPCMPROPS pProps);
 bool     DrvAudioHlpBytesIsAligned(uint32_t cbSize, PCPDMAUDIOPCMPROPS pProps);

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

@@ -1135 +1135 @@
  * Divide the result by 8 to get the byte rate.
  *
- * @returns The calculated bit rate.
+ * @returns Bitrate.
  * @param   cBits               Number of bits per sample.
  * @param   uHz                 Hz (Hertz) rate.
@@ -1142 +1142 @@
 uint32_t DrvAudioHlpCalcBitrate(uint8_t cBits, uint32_t uHz, uint8_t cChannels)
 {
-    return (cBits * uHz * cChannels);
-}
-
-/**
- * Calculates the audio bit rate out of a given audio stream configuration.
+    return cBits * uHz * cChannels;
+}
+
+/**
+ * Gets the bitrate.
  *
  * Divide the result by 8 to get the byte rate.
  *
- * @returns The calculated bit rate.
+ * @returns Bit rate.
  * @param   pProps              PCM properties to calculate bitrate for.
- *
- * @remark
- */
-uint32_t DrvAudioHlpCalcBitrate(PCPDMAUDIOPCMPROPS pProps)
+ */
+uint32_t DrvAudioHlpGetBitrate(PCPDMAUDIOPCMPROPS pProps)
 {
     return DrvAudioHlpCalcBitrate(pProps->cbSample * 8, pProps->uHz, pProps->cChannels);
@@ -1716 +1714 @@
             pData->Hdr.u16NumChannels   = pProps->cChannels;
             pData->Hdr.u32SampleRate    = pProps->uHz;
-            pData->Hdr.u32ByteRate      = DrvAudioHlpCalcBitrate(pProps) / 8;
+            pData->Hdr.u32ByteRate      = DrvAudioHlpGetBitrate(pProps) / 8;
             pData->Hdr.u16BlockAlign    = pProps->cChannels * pProps->cbSample;
             pData->Hdr.u16BitsPerSample = pProps->cbSample * 8;

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

@@ -61 +61 @@
         /* a_fSwapEndian: */    false
     );
+
+    RTTESTI_CHECK(DrvAudioHlpGetBitrate(&s_Cfg441StereoS16) == 44100*4*8);
+    RTTESTI_CHECK(DrvAudioHlpGetBitrate(&s_Cfg441StereoU32) == 44100*8*8);
 
     RTTESTI_CHECK_MSG(PDMAUDIOPCMPROPS_F2B(&s_Cfg441StereoS16, 1) == 4,