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

Timestamp:

May 28, 2021 12:13:29 PM (4 years ago)

Author:

vboxsync

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

144700

Message:

Audio: Replaced AudioMixBufLive with AudioMixBufUsed (without child buffers there isn't a distinction any more). bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixBuffer.cpp (modified) (1 diff)
• AudioMixBuffer.h (modified) (1 diff)
• AudioMixer.cpp (modified) (5 diffs)
• testcase/tstAudioMixBuffer.cpp (modified) (2 diffs)

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

@@ -845 +845 @@
 
 /**
- * Get the number of readable frames in the buffer.
- *
- * @returns Number of frames.
- * @param   pMixBuf     The mixing buffer.
- * @todo Exactly same as AudioMixBufUsed.
- */
-uint32_t AudioMixBufLive(PCAUDIOMIXBUF pMixBuf)
-{
-    return AudioMixBufUsed(pMixBuf);
-}
-
-
-/**
  * Worker for AudioMixBufFree and AudioMixBufFreeBytes.
  */

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

@@ -192 +192 @@
 uint32_t    AudioMixBufUsed(PCAUDIOMIXBUF pMixBuf);
 uint32_t    AudioMixBufUsedBytes(PCAUDIOMIXBUF pMixBuf);
-uint32_t    AudioMixBufLive(PCAUDIOMIXBUF pMixBuf);
 uint32_t    AudioMixBufFree(PCAUDIOMIXBUF pMixBuf);
 uint32_t    AudioMixBufFreeBytes(PCAUDIOMIXBUF pMixBuf);

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

@@ -761 +761 @@
      */
     uint32_t const cFramesDmaAndMixBuf = PDMAudioPropsBytesToFrames(&pSink->MixBuf.Props, cbDmaLeftToDrain)
-                                       + AudioMixBufLive(&pSink->MixBuf);
+                                       + AudioMixBufUsed(&pSink->MixBuf);
     uint64_t const cNsToDrainMax       = PDMAudioPropsFramesToNano(&pSink->MixBuf.Props, cFramesDmaAndMixBuf + cFramesStreamMax);
     uint64_t const nsDeadline          = cNsToDrainMax * 2;
@@ -1031 +1031 @@
     if (pSink->fStatus & AUDMIXSINK_STS_RUNNING)
     {
-        uint32_t const cFrames = AudioMixBufLive(&pSink->MixBuf);
+        uint32_t const cFrames = AudioMixBufUsed(&pSink->MixBuf);
         cbReadable = PDMAudioPropsFramesToBytes(&pSink->PCMProps, cFrames);
     }
@@ -1717 +1717 @@
 static uint32_t audioMixerSinkUpdateOutputCalcFramesToRead(PAUDMIXSINK pSink, uint32_t *pcWritableStreams)
 {
-    uint32_t      cFramesToRead    = AudioMixBufLive(&pSink->MixBuf); /* (to read from the mixing buffer) */
+    uint32_t      cFramesToRead    = AudioMixBufUsed(&pSink->MixBuf); /* (to read from the mixing buffer) */
     uint32_t      cWritableStreams = 0;
     PAUDMIXSTREAM pMixStream;
@@ -1784 +1784 @@
         || AudioMixBufFree(&pSink->MixBuf) > 2)
         Log3Func(("%s: cLiveFrames=%#x cFramesToRead=%#x cWritableStreams=%#x\n", pSink->pszName,
-                  AudioMixBufLive(&pSink->MixBuf), cFramesToRead, cWritableStreams));
+                  AudioMixBufUsed(&pSink->MixBuf), cFramesToRead, cWritableStreams));
     else
     {
@@ -1830 +1830 @@
 
         Log3Func(("%s: cLiveFrames=%#x cFramesToRead=%#x cWritableStreams=%#x cMarkedUnreliable=%#x cReliableStreams=%#x\n",
-                  pSink->pszName, AudioMixBufLive(&pSink->MixBuf), cFramesToRead,
+                  pSink->pszName, AudioMixBufUsed(&pSink->MixBuf), cFramesToRead,
                   cWritableStreams, cMarkedUnreliable, cReliableStreams));
     }

trunk/src/VBox/Devices/Audio/testcase/tstAudioMixBuffer.cpp

@@ -625 +625 @@
         RTTESTI_CHECK_MSG_BREAK(cSrcFrames == cSrcFramesWritten,
                                 ("cSrcFrames=%RU32 vs cSrcFramesWritten=%RU32 cLiveFrames=%RU32\n",
-                                 cSrcFrames, cSrcFramesWritten, AudioMixBufLive(&MixBuf)));
+                                 cSrcFrames, cSrcFramesWritten, AudioMixBufUsed(&MixBuf)));
         AudioMixBufCommit(&MixBuf, cSrcFrames);
 
@@ -664 +664 @@
          */
         AudioMixBufAdvance(&MixBuf, cSrcFrames);
-        RTTESTI_CHECK(AudioMixBufLive(&MixBuf) == 0);
+        RTTESTI_CHECK(AudioMixBufUsed(&MixBuf) == 0);
     }