Changeset 55380 in vbox for trunk/src/VBox

Timestamp:

Apr 22, 2015 2:14:48 PM (10 years ago)

Author:

vboxsync

Message:

Audio: Implemented muting of streams.

File:

• trunk/src/VBox/Devices/Audio/AudioMixBuffer.cpp (modified) (3 diffs)

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

@@ -489 +489 @@
 #undef AUDMIXBUF_MACRO_LOG
 
+/** Dummy conversion used when the source is muted. */
+AUDMIXBUF_MACRO_FN uint32_t audioMixBufConvFromSilence(PPDMAUDIOSAMPLE paDst, const void *pvSrc,
+                                                       uint32_t cbSrc, const PAUDMIXBUF_CONVOPTS pOpts)
+{
+    /* Internally zero always corresponds to silence. */
+    memset(paDst, 0, pOpts->cSamples * sizeof(paDst[0]));
+    return pOpts->cSamples;
+}
+
 /**
  *
  ** @todo Speed up the lookup by binding it to the actual stream state.
  *
- * @return  IPRT status code.
  * @return  PAUDMIXBUF_FN_CONVFROM
- * @param   enmFmt
+ * @param   enmFmt      The source audio stream format
+ * @param   fMuted      Flag determining whether the source is muted
  */
-static inline PAUDMIXBUF_FN_CONVFROM audioMixBufConvFromLookup(PDMAUDIOMIXBUFFMT enmFmt)
-{
+static inline PAUDMIXBUF_FN_CONVFROM audioMixBufConvFromLookup(PDMAUDIOMIXBUFFMT enmFmt, bool fMuted)
+{
+    if (fMuted)
+        return audioMixBufConvFromSilence;
+
     if (AUDMIXBUF_FMT_SIGNED(enmFmt))
     {
@@ -1235 +1247 @@
         return VERR_BUFFER_OVERFLOW;
 
-    PAUDMIXBUF_FN_CONVFROM pConv = audioMixBufConvFromLookup(enmFmt);
+    PAUDMIXBUF_FN_CONVFROM pConv = audioMixBufConvFromLookup(enmFmt, pMixBuf->Volume.fMuted);
     if (!pConv)
         return VERR_NOT_SUPPORTED;
@@ -1317 +1329 @@
     }
 
-    PAUDMIXBUF_FN_CONVFROM pConv = audioMixBufConvFromLookup(enmFmt);
+    PAUDMIXBUF_FN_CONVFROM pConv = audioMixBufConvFromLookup(enmFmt, pMixBuf->Volume.fMuted);
     if (!pConv)
         return VERR_NOT_SUPPORTED;