Changeset 73532 in vbox for trunk/src

Timestamp:

Aug 6, 2018 5:27:41 PM (6 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio: Few optimizations using the PDMAUDIOPCMPROPS_ macros.

File:

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

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

@@ -874 +874 @@
 uint32_t DrvAudioHlpPCMPropsBytesPerFrame(const PPDMAUDIOPCMPROPS pProps)
 {
-    return pProps->cBytes * pProps->cChannels;
+    return PDMAUDIOPCMPROPS_F2B(pProps, 1 /* Frame */);
 }
 
@@ -1137 +1137 @@
         return 0;
 
-    const uint32_t cbFrameSize = DrvAudioHlpPCMPropsBytesPerFrame(pProps);
-    return (cbSize / cbFrameSize) * cbFrameSize;
+    return PDMAUDIOPCMPROPS_B2F(pProps, cbSize) * PDMAUDIOPCMPROPS_F2B(pProps, 1 /* Frame */);
 }
 
@@ -1155 +1154 @@
         return true;
 
-    return (cbSize % DrvAudioHlpPCMPropsBytesPerFrame(pProps) == 0);
+    return (cbSize % PDMAUDIOPCMPROPS_F2B(pProps, 1 /* Frame */) == 0);
+}
+
+/**
+ * Returns the bytes per second for given PCM properties.
+ *
+ * @returns Bytes per second.
+ * @param   pProps              PCM properties to retrieve size for.
+ */
+DECLINLINE(uint64_t) drvAudioHlpBytesPerSec(const PPDMAUDIOPCMPROPS pProps)
+{
+    return PDMAUDIOPCMPROPS_F2B(pProps, 1 /* Frame */) * pProps->uHz;
 }
 
@@ -1169 +1179 @@
     AssertPtrReturn(pProps, 0);
 
-    return cbBytes / (pProps->cBytes * pProps->cChannels);
+    return PDMAUDIOPCMPROPS_B2F(pProps, cbBytes);
 }
 
@@ -1186 +1196 @@
         return 0;
 
-    const uint64_t cbBytesPerSec = pProps->cBytes * pProps->cChannels * pProps->uHz;
-    const double dbBytesPerMs = (double)cbBytesPerSec / (double)RT_MS_1SEC;
+    const double dbBytesPerMs = (double)drvAudioHlpBytesPerSec(pProps) / (double)RT_MS_1SEC;
     Assert(dbBytesPerMs >= 0.0f);
     if (!dbBytesPerMs) /* Prevent division by zero. */
@@ -1209 +1218 @@
         return 0;
 
-    const double dbBytesPerMs = (pProps->cBytes * pProps->cChannels * pProps->uHz) / RT_NS_1SEC;
+    const double dbBytesPerMs = (PDMAUDIOPCMPROPS_F2B(pProps, 1 /* Frame */) * pProps->uHz) / RT_NS_1SEC;
     Assert(dbBytesPerMs >= 0.0f);
     if (!dbBytesPerMs) /* Prevent division by zero. */
@@ -1231 +1240 @@
         return 0;
 
-    return cFrames * pProps->cBytes * pProps->cChannels;
+    return cFrames * PDMAUDIOPCMPROPS_F2B(pProps, 1 /* Frame */);
 }
 
@@ -1288 +1297 @@
         return 0;
 
-    const uint64_t cbBytesPerSec = pProps->cBytes * pProps->cChannels * pProps->uHz;
-    return ((double)cbBytesPerSec / (double)RT_MS_1SEC) * uMs;
+    return ((double)drvAudioHlpBytesPerSec(pProps) / (double)RT_MS_1SEC) * uMs;
 }
 
@@ -1306 +1314 @@
         return 0;
 
-    const uint64_t cbBytesPerSec = pProps->cBytes * pProps->cChannels * pProps->uHz;
-    return ((double)cbBytesPerSec / (double)RT_NS_1SEC) * uNs;
+    return ((double)drvAudioHlpBytesPerSec(pProps) / (double)RT_NS_1SEC) * uNs;
 }
 
@@ -1321 +1328 @@
     AssertPtrReturn(pProps, 0);
 
-    const uint32_t cbFrame = pProps->cBytes * pProps->cChannels;
+    const uint32_t cbFrame = PDMAUDIOPCMPROPS_F2B(pProps, 1 /* Frame */);
     if (!cbFrame) /* Prevent division by zero. */
         return 0;
@@ -1339 +1346 @@
     AssertPtrReturn(pProps, 0);
 
-    const uint32_t cbFrame = pProps->cBytes * pProps->cChannels;
+    const uint32_t cbFrame = PDMAUDIOPCMPROPS_F2B(pProps, 1 /* Frame */);
     if (!cbFrame) /* Prevent division by zero. */
         return 0;