Changeset 89338 in vbox

Timestamp:

May 28, 2021 8:57:49 AM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

144687

Message:

AudioMixer: Removed unused members from AUDIOMIXBUF and rearranged them for better locality. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixBuffer.cpp (modified) (1 diff)
• AudioMixBuffer.h (modified) (3 diffs)

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

@@ -793 +793 @@
     pMixBuf->Volume.uRight = AUDIOMIXBUF_VOL_0DB;
 
-    /* Prevent division by zero.
-     * Do a 1:1 conversion according to AUDIOMIXBUF_S2B_RATIO. */
-    pMixBuf->iFreqRatio = 1 << 20;
-
     pMixBuf->Props       = *pProps;
 

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

@@ -143 +143 @@
     /** Magic value (AUDIOMIXBUF_MAGIC). */
     uint32_t                    uMagic;
-    uint8_t                     abPadding[4];
-    /* ???Undocumented??? */
-    RTLISTNODE                  Node;
-    /** Name of the buffer. */
-    char                       *pszName;
+    /** Size of the frame buffer (in audio frames). */
+    uint32_t                    cFrames;
     /** Frame buffer. */
     PPDMAUDIOFRAME              pFrames;
-    /** Size of the frame buffer (in audio frames). */
-    uint32_t                    cFrames;
     /** The current read position (in frames). */
     uint32_t                    offRead;
@@ -165 +160 @@
      * @note This also is known as the distance in ring buffer terms. */
     uint32_t                    cUsed;
+    /** Audio properties for the buffer content - for frequency and channel count.
+     * (This is the guest side PCM properties.) */
+    PDMAUDIOPCMPROPS            Props;
     /** Internal representation of current volume used for mixing. */
     AUDMIXBUFVOL                Volume;
-    /** Audio input properties.
-     * @note There is only one set of audio properties here because we have one
-     *       mixer buffer for the guest side and a separate one for the host side.
-     * @todo r=bird: Why exactly do we need to use separate mixer buffers?
-     *       Couldn't we just have different conversion fuctions and save the
-     *       extra copying? */
-    PDMAUDIOPCMPROPS            Props;
-
-    /** Ratio of the associated parent stream's frequency by this stream's
-     * frequency (1<<32), represented as a signed 64 bit integer.
-     *
-     * For example, if the parent stream has a frequency of 44 khZ, and this
-     * stream has a frequency of 11 kHz, the ration then would be
-     * (44/11 * (1 << 32)).
-     *
-     * Currently this does not get changed once assigned. */
-    int64_t                     iFreqRatio;
+    /** Name of the buffer. */
+    char                       *pszName;
 } AUDIOMIXBUF;
 
@@ -196 +179 @@
  * @note Does *not* take the conversion ratio into account. */
 #define AUDIOMIXBUF_B2F(a_pMixBuf, a_cb)        PDMAUDIOPCMPROPS_B2F(&(a_pMixBuf)->Props, a_cb)
-
-/** Converts frames to bytes, respecting the conversion ratio to
- *  a linked buffer. */
-#define AUDIOMIXBUF_F2B_RATIO(a_pMixBuf, a_cFrames) AUDIOMIXBUF_F2B(a_pMixBuf, AUDIOMIXBUF_F2F_RATIO(a_pMixBuf, a_cFrames))
-/** Converts number of frames according to the buffer's ratio.
- * @todo r=bird: Why the *signed* cast?  */
-#define AUDIOMIXBUF_F2F_RATIO(a_pMixBuf, a_cFrames) (((int64_t)(a_cFrames) << 32) / (a_pMixBuf)->iFreqRatio)