Changeset 88920 in vbox

Timestamp:

May 6, 2021 11:19:09 PM (4 years ago)

Author:

vboxsync

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

144255

Message:

AudioMixer: Dropped the unused scratch buffer associated with AUDMIXSINK. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixer.cpp (modified) (2 diffs)
• AudioMixer.h (modified) (5 diffs)

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

@@ -776 +776 @@
         pSink->VolumeCombined.uLeft  = PDMAUDIO_VOLUME_MAX;
         pSink->VolumeCombined.uRight = PDMAUDIO_VOLUME_MAX;
-
-        const size_t cbScratchBuf = _1K; /** @todo Make this configurable? */
-
-        pSink->pabScratchBuf = (uint8_t *)RTMemAlloc(cbScratchBuf);
-        AssertPtrReturn(pSink->pabScratchBuf, VERR_NO_MEMORY);
-        pSink->cbScratchBuf  = cbScratchBuf;
     }
 
@@ -853 +847 @@
     RTStrFree(pSink->pszName);
     pSink->pszName = NULL;
-
-    RTMemFree(pSink->pabScratchBuf);
-    pSink->pabScratchBuf = NULL;
-    pSink->cbScratchBuf = 0;
 
     AudioMixBufDestroy(&pSink->MixBuf);

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

@@ -48 +48 @@
     /** The master volume of this mixer. */
     PDMAUDIOVOLUME          VolMaster;
-    /** List of audio mixer sinks. */
+    /** List of audio mixer sinks (AUDMIXSINK). */
     RTLISTANCHOR            lstSinks;
     /** Number of used audio sinks. */
@@ -57 +57 @@
 /** Pointer to an audio mixer instance. */
 typedef AUDIOMIXER *PAUDIOMIXER;
+
+/** @name AUDMIXER_FLAGS_XXX - For AudioMixerCreate().
+ * @{ */
+/** No mixer flags specified. */
+#define AUDMIXER_FLAGS_NONE             0
+/** Debug mode enabled.
+ *  This writes .WAV file to the host, usually to the temporary directory. */
+#define AUDMIXER_FLAGS_DEBUG            RT_BIT(0)
+/** Validation mask. */
+#define AUDMIXER_FLAGS_VALID_MASK       UINT32_C(0x00000001)
+/** @} */
 
 
@@ -123 +134 @@
     /** The sink direction (either PDMAUDIODIR_IN or PDMAUDIODIR_OUT). */
     PDMAUDIODIR             enmDir;
-    /** Scratch buffer for multiplexing / mixing. Might be NULL if not needed. */
-    uint8_t                *pabScratchBuf;
-    /** Size (in bytes) of pabScratchBuf. Might be 0 if not needed. */
-    size_t                  cbScratchBuf;
-    /** The sink's PCM format. */
+    /** The sink's PCM format (i.e. the guest device side). */
     PDMAUDIOPCMPROPS        PCMProps;
     /** Sink status bits - AUDMIXSINK_STS_XXX. */
@@ -133 +140 @@
     /** Number of streams assigned. */
     uint8_t                 cStreams;
-    /** List of assigned streams.
+    /** List of assigned streams (AUDMIXSTREAM).
      * @note All streams have the same PCM properties, so the mixer does not do
      *       any conversion.  bird: That is *NOT* true any more, the mixer has
@@ -209 +216 @@
 
 
-/** @name AUDMIXER_FLAGS_XXX - For AudioMixerCreate().
- * @{ */
-/** No mixer flags specified. */
-#define AUDMIXER_FLAGS_NONE             0
-/** Debug mode enabled.
- *  This writes .WAV file to the host, usually to the temporary directory. */
-#define AUDMIXER_FLAGS_DEBUG            RT_BIT(0)
-/** Validation mask. */
-#define AUDMIXER_FLAGS_VALID_MASK       UINT32_C(0x00000001)
-/** @} */
-
-
 int AudioMixerCreate(const char *pszName, uint32_t fFlags, PAUDIOMIXER *ppMixer);
 int AudioMixerCreateSink(PAUDIOMIXER pMixer, const char *pszName, PDMAUDIODIR enmDir, PPDMDEVINS pDevIns, PAUDMIXSINK *ppSink);