Changeset 89314 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

May 27, 2021 11:33:04 AM (4 years ago)

Author:

vboxsync

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

144661

Message:

Audio: Reworking the capture (recording) code path, part 3: Apply volume in the device mixer rather than in DrvAudio. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixBuffer.cpp (modified) (7 diffs)
• AudioMixBuffer.h (modified) (1 diff)
• AudioMixer.cpp (modified) (2 diffs)

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

@@ -491 +491 @@
  * thus don't do any bounds checking!
  *
- * Note: Currently does not handle any endianness conversion yet!
+ * @note Currently does not handle any endianness conversion yet!
  */
 #define AUDMIXBUF_CONVERT(a_Name, a_Type, _aMin, _aMax, _aSigned, _aShift) \
@@ -513 +513 @@
             return     (a_Type) ((iVal >> (32 - _aShift)) + ((_aMax >> 1) + 1)); \
         } \
+        AssertMsgFailed(("%RI64 (%#RX64)\n", iVal, iVal)); /* shouldn't be possible with current buffer operations */ \
         return iVal >= 0 ? _aMax : _aMin; \
     } \
@@ -1204 +1205 @@
  * @param   pVolSrc                 Volume to convert.
  */
-static int audioMixBufConvVol(PAUDMIXBUFVOL pVolDst, PPDMAUDIOVOLUME pVolSrc)
+static int audioMixBufConvVol(PAUDMIXBUFVOL pVolDst, PCPDMAUDIOVOLUME pVolSrc)
 {
     if (!pVolSrc->fMuted) /* Only change/convert the volume value if we're not muted. */
@@ -2848 +2849 @@
 
 /**
- * Advances the write position of the buffer.
+ * Worker for audioMixAdjustVolume that adjust one contiguous chunk.
+ */
+static void audioMixAdjustVolumeWorker(PAUDIOMIXBUF pMixBuf, uint32_t off, uint32_t cFrames)
+{
+    PPDMAUDIOFRAME const    paFrames = pMixBuf->pFrames;
+    uint32_t const          uLeft    = pMixBuf->Volume.uLeft;
+    uint32_t const          uRight   = pMixBuf->Volume.uRight;
+    while (cFrames-- > 0)
+    {
+        paFrames[off].i64LSample = ASMMult2xS32RetS64(paFrames[off].i64LSample, uLeft)  >> AUDIOMIXBUF_VOL_SHIFT;
+        paFrames[off].i64RSample = ASMMult2xS32RetS64(paFrames[off].i64RSample, uRight) >> AUDIOMIXBUF_VOL_SHIFT;
+        off++;
+    }
+}
+
+
+/**
+ * Does volume adjustments for the given stretch of the buffer.
+ *
+ * @param   pMixBuf     The mixing buffer.
+ * @param   offFirst    Where to start (validated).
+ * @param   cFrames     How many frames (validated).
+ */
+static void audioMixAdjustVolume(PAUDIOMIXBUF pMixBuf, uint32_t offFirst, uint32_t cFrames)
+{
+    /* Caller has already validated these, so we don't need to repeat that in non-strict builds. */
+    Assert(offFirst < pMixBuf->cFrames);
+    Assert(cFrames <= pMixBuf->cFrames);
+
+    /*
+     * Muted?
+     */
+    if (pMixBuf->Volume.fMuted)
+    {
+        uint32_t const cFramesChunk1 = RT_MIN(pMixBuf->cFrames - offFirst, cFrames);
+        RT_BZERO(&pMixBuf->pFrames[offFirst], sizeof(pMixBuf->pFrames[0]) * cFramesChunk1);
+        if (cFramesChunk1 < cFrames)
+            RT_BZERO(&pMixBuf->pFrames[0], sizeof(pMixBuf->pFrames[0]) * (cFrames - cFramesChunk1));
+    }
+    /*
+     * Less than max volume?
+     */
+    else if (   pMixBuf->Volume.uLeft  != AUDIOMIXBUF_VOL_0DB
+             || pMixBuf->Volume.uRight != AUDIOMIXBUF_VOL_0DB)
+    {
+        /* first chunk */
+        uint32_t const cFramesChunk1 = RT_MIN(pMixBuf->cFrames - offFirst, cFrames);
+        audioMixAdjustVolumeWorker(pMixBuf, offFirst, cFramesChunk1);
+        if (cFramesChunk1 < cFrames)
+            audioMixAdjustVolumeWorker(pMixBuf, 0, cFrames - cFramesChunk1);
+    }
+}
+
+
+/**
+ * Adjust for volume settings and advances the write position of the buffer.
  *
  * For use after done peeking with AudioMixBufWrite(), AudioMixBufSilence(),
@@ -2863 +2919 @@
 
     AssertStmt(cFrames <= pMixBuf->cFrames - pMixBuf->cUsed, cFrames = pMixBuf->cFrames - pMixBuf->cUsed);
+
+    audioMixAdjustVolume(pMixBuf, pMixBuf->offWrite, cFrames);
+
     pMixBuf->cUsed   += cFrames;
     pMixBuf->offWrite = (pMixBuf->offWrite + cFrames) % pMixBuf->cFrames;
@@ -2875 +2934 @@
  * @param   pVol                    Pointer to volume structure to set.
  */
-void AudioMixBufSetVolume(PAUDIOMIXBUF pMixBuf, PPDMAUDIOVOLUME pVol)
+void AudioMixBufSetVolume(PAUDIOMIXBUF pMixBuf, PCPDMAUDIOVOLUME pVol)
 {
     AssertPtrReturnVoid(pMixBuf);
@@ -2882 +2941 @@
     LogFlowFunc(("%s: lVol=%RU8, rVol=%RU8, fMuted=%RTbool\n", pMixBuf->pszName, pVol->uLeft, pVol->uRight, pVol->fMuted));
 
-    int rc2 = audioMixBufConvVol(&pMixBuf->Volume /* Dest */, pVol /* Source */);
+    int rc2 = audioMixBufConvVol(&pMixBuf->Volume, pVol);
     AssertRC(rc2);
 }

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

@@ -329 +329 @@
 uint32_t AudioMixBufReadPos(PAUDIOMIXBUF pMixBuf);
 void AudioMixBufReset(PAUDIOMIXBUF pMixBuf);
-void AudioMixBufSetVolume(PAUDIOMIXBUF pMixBuf, PPDMAUDIOVOLUME pVol);
+void AudioMixBufSetVolume(PAUDIOMIXBUF pMixBuf, PCPDMAUDIOVOLUME pVol);
 uint32_t AudioMixBufSize(PAUDIOMIXBUF pMixBuf);
 uint32_t AudioMixBufSizeBytes(PAUDIOMIXBUF pMixBuf);

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

@@ -514 +514 @@
     {
         audioMixerStreamCtlInternal(pStream, PDMAUDIOSTREAMCMD_ENABLE);
-    }
-
-    if (pSink->enmDir != PDMAUDIODIR_OUT)
-    {
-        /* Apply the sink's combined volume to the stream. */
-        int rc2 = pStream->pConn->pfnStreamSetVolume(pStream->pConn, pStream->pStream, &pSink->VolumeCombined);
-        AssertRC(rc2);
     }
 
@@ -2524 +2517 @@
              pSink->VolumeCombined.fMuted, pSink->VolumeCombined.uLeft, pSink->VolumeCombined.uRight));
 
-    /*
-     * Input sinks must currently propagate the new volume settings to
-     * all the streams.  (For output sinks we do the volume control here.)
-     */
-    if (pSink->enmDir != PDMAUDIODIR_OUT)
-    {
-        PAUDMIXSTREAM pMixStream;
-        RTListForEach(&pSink->lstStreams, pMixStream, AUDMIXSTREAM, Node)
-        {
-            int rc2 = pMixStream->pConn->pfnStreamSetVolume(pMixStream->pConn, pMixStream->pStream, &pSink->VolumeCombined);
-            AssertRC(rc2);
-        }
-    }
-
+    AudioMixBufSetVolume(&pSink->MixBuf, &pSink->VolumeCombined);
     return VINF_SUCCESS;
 }