Changeset 89397 in vbox for trunk

Timestamp:

May 31, 2021 12:35:46 PM (4 years ago)

Author:

vboxsync

Message:

AudioMixBuffer: Converting AUDMIXBUF_CONVERT into a template file to simplify debugging (can't step macro template code in windbg). bugref:9890

File:

• trunk/src/VBox/Devices/Audio/AudioMixBuffer-Convert.cpp.h (modified) (5 diffs)

trunk/src/VBox/Devices/Audio/AudioMixBuffer-Convert.cpp.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * Audio mixing buffer for converting template.
+ * Audio mixing buffer - Format conversion template.
  */
 
@@ -17 +17 @@
 
 
-/**
- * Macro for generating the conversion routines from/to different formats.
- * Be careful what to pass in/out, as most of the macros are optimized for speed and
- * thus don't do any bounds checking!
- *
- * @note Currently does not handle any endianness conversion yet!
- */
-#define AUDMIXBUF_CONVERT(a_Name, a_Type, _aMin, _aMax, _aSigned, _aShift) \
+#define AUDMIXBUF_CONVERT(a_Name, a_Type, a_Min, a_Max, a_fSigned, a_cShift) \
 /* Clips a specific output value to a single sample value. */ \
 DECLINLINE(int32_t) audioMixBufSampleFrom##a_Name(a_Type aVal) \
 { \
     /* left shifting of signed values is not defined, therefore the intermediate uint64_t cast */ \
-    if (_aSigned) \
-        return (int32_t) (((uint32_t) ((int32_t) aVal                     )) << (32 - _aShift)); \
-    return     (int32_t) (((uint32_t) ((int32_t) aVal - ((_aMax >> 1) + 1))) << (32 - _aShift)); \
+    if (a_fSigned) \
+        return (int32_t) (((uint32_t) ((int32_t) aVal                     )) << (32 - a_cShift)); \
+    return     (int32_t) (((uint32_t) ((int32_t) aVal - ((a_Max >> 1) + 1))) << (32 - a_cShift)); \
 } \
 \
@@ -37 +30 @@
 DECLINLINE(a_Type) audioMixBufSampleTo##a_Name(int32_t iVal) \
 { \
-    if (_aSigned) \
-        return (a_Type)  (iVal >> (32 - _aShift)); \
-    return     (a_Type) ((iVal >> (32 - _aShift)) + ((_aMax >> 1) + 1)); \
+    if (a_fSigned) \
+        return (a_Type)  (iVal >> (32 - a_cShift)); \
+    return     (a_Type) ((iVal >> (32 - a_cShift)) + ((a_Max >> 1) + 1)); \
 } \
 \
@@ -61 +54 @@
                 pDst[idxDst] = audioMixBufSampleTo##a_Name(pi32Src[idxSrc]); \
             else if (idxSrc != -2) \
-                pDst[idxDst] = (_aSigned) ? 0 : (_aMax >> 1); \
+                pDst[idxDst] = (a_fSigned) ? 0 : (a_Max >> 1); \
             else \
                 pDst[idxDst] = 0; \
@@ -147 +140 @@
                 pi32Dst[idxDst] = audioMixBufSampleTo##a_Name(pSrc[idxSrc]); \
             else if (idxSrc != -2) \
-                pi32Dst[idxDst] = (_aSigned) ? 0 : (_aMax >> 1); \
+                pi32Dst[idxDst] = (a_fSigned) ? 0 : (a_Max >> 1); \
             else \
                 pi32Dst[idxDst] = 0; \