Changeset 89335 in vbox for trunk/src/VBox

Timestamp:

May 28, 2021 8:44:41 AM (4 years ago)

Author:

vboxsync

Message:

AudioMixer: Removed AudioMixBufAcquireReadBlock, AudioMixBufReleaseReadBlock and AudioMixBufFinish. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixBuffer.cpp (modified) (2 diffs)
• AudioMixBuffer.h (modified) (2 diffs)
• testcase/tstAudioMixBuffer.cpp (modified) (9 diffs)

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

@@ -150 +150 @@
     if (pMixBuf->cFrames)
         RT_BZERO(pMixBuf->pFrames, pMixBuf->cFrames * sizeof(PDMAUDIOFRAME));
-}
-
-/**
- * Clears (zeroes) the buffer by a certain amount of (used) frames and
- * keeps track to eventually assigned children buffers.
- *
- * @param   pMixBuf                 Mixing buffer to clear.
- * @param   cFramesToClear          Number of audio frames to clear.
- */
-void AudioMixBufFinish(PAUDIOMIXBUF pMixBuf, uint32_t cFramesToClear)
-{
-    AUDMIXBUF_LOG(("cFramesToClear=%RU32\n", cFramesToClear));
-    AUDMIXBUF_LOG(("%s: offRead=%RU32, cUsed=%RU32\n",
-                   pMixBuf->pszName, pMixBuf->offRead, pMixBuf->cUsed));
-
-    AssertStmt(cFramesToClear <= pMixBuf->cFrames, cFramesToClear = pMixBuf->cFrames);
-
-/** @todo r=bird: waste of time? */
-    uint32_t cClearOff;
-    uint32_t cClearLen;
-
-    /* Clear end of buffer (wrap around). */
-    if (cFramesToClear > pMixBuf->offRead)
-    {
-        cClearOff = pMixBuf->cFrames - (cFramesToClear - pMixBuf->offRead);
-        cClearLen = pMixBuf->cFrames - cClearOff;
-
-        AUDMIXBUF_LOG(("Clearing1: %RU32 - %RU32\n", cClearOff, cClearOff + cClearLen));
-
-        RT_BZERO(pMixBuf->pFrames + cClearOff, cClearLen * sizeof(PDMAUDIOFRAME));
-
-        Assert(cFramesToClear >= cClearLen);
-        cFramesToClear -= cClearLen;
-    }
-
-    /* Clear beginning of buffer. */
-    if (   cFramesToClear
-        && pMixBuf->offRead)
-    {
-        Assert(pMixBuf->offRead >= cFramesToClear);
-
-        cClearOff = pMixBuf->offRead - cFramesToClear;
-        cClearLen = cFramesToClear;
-
-        Assert(cClearOff + cClearLen <= pMixBuf->cFrames);
-
-        AUDMIXBUF_LOG(("Clearing2: %RU32 - %RU32\n", cClearOff, cClearOff + cClearLen));
-
-        RT_BZERO(pMixBuf->pFrames + cClearOff, cClearLen * sizeof(PDMAUDIOFRAME));
-    }
 }
 
@@ -1210 +1160 @@
 }
 
-/**
- * Reads audio frames. The audio format of the mixing buffer will be used.
- *
- * @returns VBox status code.
- * @param   pMixBuf             Mixing buffer to read audio frames from.
- * @param   pvBuf               Pointer to buffer to write output to.
- * @param   cbBuf               Size (in bytes) of buffer to write to.
- * @param   pcAcquiredFrames    Where to return the number of frames in
- *                              the block that was acquired.
- */
-int AudioMixBufAcquireReadBlock(PAUDIOMIXBUF pMixBuf, void *pvBuf, uint32_t cbBuf, uint32_t *pcAcquiredFrames)
-{
-    return AudioMixBufAcquireReadBlockEx(pMixBuf, &pMixBuf->Props, pvBuf, cbBuf, pcAcquiredFrames);
-}
-
-/**
- * Reads audio frames in a specific audio format.
- *
- * If the audio format of the mixing buffer and the requested audio format do
- * not match the output will be converted accordingly.
- *
- * @returns VBox status code.
- * @param   pMixBuf             Mixing buffer to read audio frames from.
- * @param   pDstProps           The target format.
- * @param   pvBuf               Pointer to buffer to write output to.
- * @param   cbBuf               Size (in bytes) of buffer to write to.
- * @param   pcAcquiredFrames    Where to return the number of frames in
- *                              the block that was acquired.
- */
-int AudioMixBufAcquireReadBlockEx(PAUDIOMIXBUF pMixBuf, PCPDMAUDIOPCMPROPS pDstProps,
-                                  void *pvBuf, uint32_t cbBuf, uint32_t *pcAcquiredFrames)
-{
-    AssertPtrReturn(pMixBuf, VERR_INVALID_POINTER);
-    AssertReturn(cbBuf, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
-    AssertPtrReturn(pcAcquiredFrames, VERR_INVALID_POINTER);
-
-    /* Make sure that we at least have space for a full audio frame. */
-    AssertReturn(AUDIOMIXBUF_B2F(pMixBuf, cbBuf), VERR_INVALID_PARAMETER);
-
-    uint32_t cFramesToRead = RT_MIN(pMixBuf->cUsed, AUDIOMIXBUF_B2F(pMixBuf, cbBuf));
-
-#ifdef AUDMIXBUF_LOG_ENABLED
-    char szTmp1[PDMAUDIOPROPSTOSTRING_MAX], szTmp2[PDMAUDIOPROPSTOSTRING_MAX];
-#endif
-    AUDMIXBUF_LOG(("%s: cbBuf=%RU32 (%RU32 frames), cFramesToRead=%RU32, MixBuf=%s, pDstProps=%s\n",
-                   pMixBuf->pszName, cbBuf, AUDIOMIXBUF_B2F(pMixBuf, cbBuf), cFramesToRead,
-                   PDMAudioPropsToString(&pMixBuf->Props, szTmp1, sizeof(szTmp1)),
-                   PDMAudioPropsToString(pDstProps, szTmp2, sizeof(szTmp2))));
-    if (!cFramesToRead)
-    {
-#ifdef DEBUG
-        audioMixBufDbgPrintInternal(pMixBuf, __FUNCTION__);
-#endif
-        *pcAcquiredFrames = 0;
-        return VINF_SUCCESS;
-    }
-
-    PFNAUDIOMIXBUFCONVTO pfnConvTo;
-    if (PDMAudioPropsAreEqual(&pMixBuf->Props, pDstProps))
-        pfnConvTo = pMixBuf->pfnConvTo;
-    else
-        pfnConvTo = audioMixBufConvToLookup(pDstProps);
-    AssertReturn(pfnConvTo, VERR_NOT_SUPPORTED);
-
-    cFramesToRead = RT_MIN(cFramesToRead, pMixBuf->cFrames - pMixBuf->offRead);
-    if (cFramesToRead)
-    {
-        AUDMIXBUFCONVOPTS convOpts;
-        RT_ZERO(convOpts);
-        convOpts.cFrames = cFramesToRead;
-
-        AUDMIXBUF_LOG(("cFramesToRead=%RU32\n", cFramesToRead));
-
-        pfnConvTo(pvBuf, pMixBuf->pFrames + pMixBuf->offRead, &convOpts);
-
-#ifdef AUDIOMIXBUF_DEBUG_DUMP_PCM_DATA
-        RTFILE fh;
-        int rc2 = RTFileOpen(&fh, AUDIOMIXBUF_DEBUG_DUMP_PCM_DATA_PATH "mixbuf_readcirc.pcm",
-                             RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
-        if (RT_SUCCESS(rc2))
-        {
-            RTFileWrite(fh, pvBuf, AUDIOMIXBUF_F2B(pMixBuf, cFramesToRead), NULL);
-            RTFileClose(fh);
-        }
-#endif
-    }
-
-    *pcAcquiredFrames = cFramesToRead;
-
-#ifdef DEBUG
-    audioMixBufDbgValidate(pMixBuf);
-#endif
-
-    AUDMIXBUF_LOG(("*pcAcquiredFrames=%RU32 (%RU32 bytes)\n", cFramesToRead, AUDIOMIXBUF_F2B(pMixBuf, cFramesToRead)));
-    return VINF_SUCCESS;
-}
-
-/**
- * Releases a formerly acquired read block.
- *
- * @param   pMixBuf     Mixing buffer to release acquired read block for.
- * @param   cFrames     The number of frames to release.  (Can be less than the
- *                      acquired count.)
- */
-void AudioMixBufReleaseReadBlock(PAUDIOMIXBUF pMixBuf, uint32_t cFrames)
-{
-    AssertPtrReturnVoid(pMixBuf);
-
-    if (cFrames)
-    {
-        AssertStmt(pMixBuf->cUsed >= cFrames, cFrames = pMixBuf->cUsed);
-        pMixBuf->offRead  = (pMixBuf->offRead + cFrames) % pMixBuf->cFrames;
-        pMixBuf->cUsed   -= cFrames;
-    }
-}
 
 /**

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

@@ -276 +276 @@
 
 void AudioMixBufClear(PAUDIOMIXBUF pMixBuf);
-void AudioMixBufFinish(PAUDIOMIXBUF pMixBuf, uint32_t cFramesToClear);
 uint32_t AudioMixBufFree(PAUDIOMIXBUF pMixBuf);
 uint32_t AudioMixBufFreeBytes(PAUDIOMIXBUF pMixBuf);
@@ -283 +282 @@
 uint32_t AudioMixBufUsed(PAUDIOMIXBUF pMixBuf);
 uint32_t AudioMixBufUsedBytes(PAUDIOMIXBUF pMixBuf);
-int         AudioMixBufAcquireReadBlock(PAUDIOMIXBUF pMixBuf, void *pvBuf, uint32_t cbBuf, uint32_t *pcAcquiredFrames);
-int         AudioMixBufAcquireReadBlockEx(PAUDIOMIXBUF pMixBuf, PCPDMAUDIOPCMPROPS pDstProps,
-                                          void *pvBuf, uint32_t cbBuf, uint32_t *pcAcquiredFrames);
-void AudioMixBufReleaseReadBlock(PAUDIOMIXBUF pMixBuf, uint32_t cFrames);
 uint32_t AudioMixBufReadPos(PAUDIOMIXBUF pMixBuf);
 void AudioMixBufReset(PAUDIOMIXBUF pMixBuf);

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

@@ -215 +215 @@
     RTTESTI_CHECK(AUDIOMIXBUF_F2B(&mb, AudioMixBufFree(&mb)) == AudioMixBufFreeBytes(&mb));
 
-    AUDIOMIXBUFWRITESTATE WrState;
-    RTTESTI_CHECK_RC(AudioMixBufInitWriteState(&mb, &WrState, &config), VINF_SUCCESS);
+    AUDIOMIXBUFWRITESTATE WriteState;
+    RTTESTI_CHECK_RC(AudioMixBufInitWriteState(&mb, &WriteState, &config), VINF_SUCCESS);
+
+    AUDIOMIXBUFPEEKSTATE PeekState;
+    RTTESTI_CHECK_RC(AudioMixBufInitPeekState(&mb, &PeekState, &config), VINF_SUCCESS);
 
     /*
@@ -227 +230 @@
     RTTESTI_CHECK(AudioMixBufUsed(&mb) == 0);
 
-    AudioMixBufWrite(&mb, &WrState, &aFrames16, sizeof(aFrames16), 0 /*offDstFrame*/, cBufSize / 4, &cFramesWritten);
+    AudioMixBufWrite(&mb, &WriteState, &aFrames16, sizeof(aFrames16), 0 /*offDstFrame*/, cBufSize / 4, &cFramesWritten);
     RTTESTI_CHECK(cFramesWritten == 1 /* Frames */);
     RTTESTI_CHECK(AudioMixBufUsed(&mb) == 0);
@@ -235 +238 @@
     RTTESTI_CHECK(AudioMixBufWritePos(&mb) == 1);
 
-    AudioMixBufWrite(&mb, &WrState, &aFrames32, sizeof(aFrames32), 0 /*offDstFrame*/, cBufSize / 4, &cFramesWritten);
+    AudioMixBufWrite(&mb, &WriteState, &aFrames32, sizeof(aFrames32), 0 /*offDstFrame*/, cBufSize / 4, &cFramesWritten);
     RTTESTI_CHECK(cFramesWritten == 2 /* Frames */);
     AudioMixBufCommit(&mb, cFramesWritten);
@@ -253 +256 @@
     uint16_t *paSamples = (uint16_t *)RTMemAlloc(cbSamples);
     RTTESTI_CHECK_RETV(paSamples);
-    AudioMixBufWrite(&mb, &WrState, paSamples, cbSamples, 0 /*offDstFrame*/, cBufSize, &cFramesWritten);
+    AudioMixBufWrite(&mb, &WriteState, paSamples, cbSamples, 0 /*offDstFrame*/, cBufSize, &cFramesWritten);
     RTTESTI_CHECK(cFramesWritten == cBufSize);
     AudioMixBufCommit(&mb, cFramesWritten);
@@ -263 +266 @@
 
     /*
-     * Circular writes.
+     * Writes and reads (used to be circular).
      */
     AudioMixBufReset(&mb);
@@ -272 +275 @@
     for (uint32_t i = 0; i < cToWrite; i++)
     {
-        AudioMixBufWrite(&mb, &WrState, &aFrames16[0], sizeof(aFrames16), 0 /*offDstFrame*/, 1, &cFramesWritten);
+        AudioMixBufWrite(&mb, &WriteState, &aFrames16[0], sizeof(aFrames16), 0 /*offDstFrame*/, 1, &cFramesWritten);
         RTTESTI_CHECK(cFramesWritten == 1);
         AudioMixBufCommit(&mb, cFramesWritten);
@@ -281 +284 @@
     RTTESTI_CHECK(AudioMixBufUsed(&mb) == cToWrite + cFramesWrittenAbs /* + last absolute write */);
 
-    AudioMixBufWrite(&mb, &WrState, &aFrames16[0], sizeof(aFrames16), 0 /*offDstFrame*/, 1, &cFramesWritten);
+    AudioMixBufWrite(&mb, &WriteState, &aFrames16[0], sizeof(aFrames16), 0 /*offDstFrame*/, 1, &cFramesWritten);
     RTTESTI_CHECK(cFramesWritten == 1);
     AudioMixBufCommit(&mb, cFramesWritten);
@@ -288 +291 @@
     RTTESTI_CHECK(AudioMixBufUsed(&mb) == cBufSize);
 
-    /* Circular reads. */
+    /* Reads. */
+    RTTESTI_CHECK(AudioMixBufReadPos(&mb) == 0);
+    uint32_t cbRead;
+    uint16_t aFrames16Buf[RT_ELEMENTS(aFrames16)];
     uint32_t cToRead = AudioMixBufSize(&mb) - cFramesWrittenAbs - 1;
     for (uint32_t i = 0; i < cToRead; i++)
     {
-        RTTESTI_CHECK_RC_OK(AudioMixBufAcquireReadBlock(&mb, &aFrames16, sizeof(aFrames16), &cFramesRead));
+        AudioMixBufPeek(&mb, 0 /*offSrcFrame*/, 1, &cFramesRead, &PeekState, aFrames16Buf, sizeof(aFrames16Buf), &cbRead);
         RTTESTI_CHECK(cFramesRead == 1);
-        AudioMixBufReleaseReadBlock(&mb, cFramesRead);
-        AudioMixBufFinish(&mb, cFramesRead);
+        RTTESTI_CHECK(cbRead == sizeof(aFrames16Buf));
+        AudioMixBufAdvance(&mb, cFramesRead);
+        RTTESTI_CHECK(AudioMixBufReadPos(&mb) == i + 1);
     }
     RTTESTI_CHECK(!AudioMixBufIsEmpty(&mb));
@@ -302 +309 @@
     RTTESTI_CHECK(AudioMixBufUsed(&mb) == cBufSize - cToRead);
 
-    RTTESTI_CHECK_RC_OK(AudioMixBufAcquireReadBlock(&mb, &aFrames16, sizeof(aFrames16), &cFramesRead));
+    AudioMixBufPeek(&mb, 0 /*offSrcFrame*/, 1, &cFramesRead, &PeekState, aFrames16Buf, sizeof(aFrames16Buf), &cbRead);
     RTTESTI_CHECK(cFramesRead == 1);
-    AudioMixBufReleaseReadBlock(&mb, cFramesRead);
-    AudioMixBufFinish(&mb, cFramesRead);
+    RTTESTI_CHECK(cbRead == sizeof(aFrames16Buf));
+    AudioMixBufAdvance(&mb, cFramesRead);
     RTTESTI_CHECK(AudioMixBufFree(&mb) == cBufSize - cFramesWrittenAbs);
     RTTESTI_CHECK(AudioMixBufFreeBytes(&mb) == AUDIOMIXBUF_F2B(&mb, cBufSize - cFramesWrittenAbs));
     RTTESTI_CHECK(AudioMixBufUsed(&mb) == cFramesWrittenAbs);
+    RTTESTI_CHECK(AudioMixBufReadPos(&mb) == 0);
 
     AudioMixBufDestroy(&mb);