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

Timestamp:

May 28, 2021 8:31:50 AM (4 years ago)

Author:

vboxsync

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

144682

Message:

AudioMixer: Removed AudioMixBufWriteCirc. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixBuffer.cpp (modified) (1 diff)
• AudioMixBuffer.h (modified) (1 diff)
• testcase/tstAudioMixBuffer.cpp (modified) (4 diffs)

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

@@ -2339 +2339 @@
 
 /**
- * Writes audio frames.
- *
- * The sample format being written must match the format of the mixing buffer.
- *
- * @returns VBox status code
- * @retval  VERR_BUFFER_OVERFLOW if frames which not have been processed yet
- *          have been overwritten (due to cyclic buffer).
- * @param   pMixBuf                 Pointer to mixing buffer to write to.
- * @param   pvBuf                   Pointer to audio buffer to be written.
- * @param   cbBuf                   Size (in bytes) of audio buffer.
- * @param   pcWritten               Returns number of audio frames written. Optional.
- */
-int AudioMixBufWriteCirc(PAUDIOMIXBUF pMixBuf, const void *pvBuf, uint32_t cbBuf, uint32_t *pcWritten)
-{
-    return AudioMixBufWriteCircEx(pMixBuf, &pMixBuf->Props, pvBuf, cbBuf, pcWritten);
-}
-
-/**
- * Writes audio frames of a specific format.
- * This function might write less data at once than requested.
- *
- * @returns VBox status code
- * @retval  VERR_BUFFER_OVERFLOW no space is available for writing anymore.
- * @param   pMixBuf     Pointer to mixing buffer to write to.
- * @param   pSrcProps   The source format.
- * @param   pvBuf       Pointer to audio buffer to be written.
- * @param   cbBuf       Size (in bytes) of audio buffer.
- * @param   pcWritten   Returns number of audio frames written. Optional.
- */
-int AudioMixBufWriteCircEx(PAUDIOMIXBUF pMixBuf, PCPDMAUDIOPCMPROPS pSrcProps,
-                           const void *pvBuf, uint32_t cbBuf, uint32_t *pcWritten)
-{
-    /*
-     * Assert sanity.
-     */
-    AssertPtrReturn(pMixBuf, VERR_INVALID_POINTER);
-    AssertReturn(pMixBuf->uMagic == AUDIOMIXBUF_MAGIC, VERR_INVALID_HANDLE);
-    Assert(pMixBuf->cFrames);
-    AssertPtr(pMixBuf->pFrames);
-    AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
-    AssertPtrNullReturn(pcWritten, VERR_INVALID_POINTER);
-
-    /*
-     * Make sure that we at least write a full audio frame.
-     */
-    uint32_t const cFramesInBuf = PDMAudioPropsBytesToFrames(pSrcProps, cbBuf);
-    if (cFramesInBuf > 0)
-    { /* likely */ }
-    else
-    {
-        if (pcWritten)
-            *pcWritten = 0;
-        AssertReturn(cbBuf == 0, VERR_INVALID_PARAMETER);
-        return VINF_SUCCESS;
-    }
-
-    /*
-     * Get the conversion function matching pSrcProps, doing special
-     * optimizations for a muted buffer.
-     */
-    PFNAUDIOMIXBUFCONVFROM pfnConvFrom = NULL;
-    if (!pMixBuf->Volume.fMuted)
-    {
-        if (PDMAudioPropsAreEqual(&pMixBuf->Props, pSrcProps))
-            pfnConvFrom = pMixBuf->pfnConvFrom;
-        else
-            pfnConvFrom = audioMixBufConvFromLookup(pSrcProps);
-        AssertReturn(pfnConvFrom, VERR_NOT_SUPPORTED);
-    }
-    else
-        pfnConvFrom = &audioMixBufConvFromSilence;
-
-    /*
-     * Is there any free space left in the buffer?
-     */
-    int      rc             = VINF_SUCCESS;
-    uint32_t cFramesWritten = 0;
-    uint32_t cFramesFree    = pMixBuf->cFrames - pMixBuf->cUsed;
-    if (cFramesFree > 0)
-    {
-        /*
-         * There are potentially two writes we can make, one from offWrite and
-         * a 2nd one from the start of the buffer.
-         */
-        uint32_t cFramesToWrite1 = RT_MIN(pMixBuf->cFrames - pMixBuf->offWrite, cFramesFree);
-        uint32_t cFramesToWrite2 = 0;
-        if (cFramesToWrite1 >= cFramesInBuf)
-            cFramesToWrite1 = cFramesInBuf;                   /* The first write can hold it all. */
-        else if (cFramesFree >= cFramesInBuf)
-            cFramesToWrite2 = cFramesInBuf - cFramesToWrite1; /* If we wrap around, we can make it all fit. */
-        else if (cFramesToWrite1 < cFramesFree)
-            cFramesToWrite2 = cFramesFree - cFramesToWrite1;  /* Not enough free space.  Must wrap around to fill it all, though. */
-        else
-            cFramesToWrite1 = cFramesFree;                    /* Not enough free space, the read position is before the wraparound. */
-        Assert(cFramesToWrite1);
-        Log4Func(("cbBuf=%#x cFramesInBuf=%#x cFramesFree=%#x offWrite=%#x cFrames=%#x => %#x + %#x\n",
-                  cbBuf, cFramesInBuf, cFramesFree, pMixBuf->offWrite, pMixBuf->cFrames, cFramesToWrite1, cFramesToWrite2));
-
-        /*
-         * Set up the conversion and do the first chunk.
-         */
-        AUDMIXBUFCONVOPTS ConvOpts;
-        ConvOpts.From.Volume.fMuted = pMixBuf->Volume.fMuted;
-        ConvOpts.From.Volume.uLeft  = pMixBuf->Volume.uLeft;
-        ConvOpts.From.Volume.uRight = pMixBuf->Volume.uRight;
-        ConvOpts.cFrames            = cFramesToWrite1;
-
-        uint32_t const cbToWrite1 = PDMAudioPropsFramesToBytes(pSrcProps, cFramesToWrite1);
-        cFramesWritten = pfnConvFrom(&pMixBuf->pFrames[pMixBuf->offWrite],
-                                     pvBuf, PDMAudioPropsFramesToBytes(pSrcProps, cFramesToWrite1), &ConvOpts);
-        Assert(cFramesWritten == cFramesToWrite1);
-
-        /*
-         * Any 2nd buffer?
-         */
-        if (cFramesToWrite2 > 0 && cFramesWritten == cFramesToWrite1)
-        {
-            ConvOpts.cFrames = cFramesToWrite2;
-            uint32_t const cbToWrite2 = PDMAudioPropsFramesToBytes(pSrcProps, cFramesToWrite2);
-            cFramesWritten += pfnConvFrom(&pMixBuf->pFrames[0], (uint8_t const *)pvBuf + cbToWrite1, cbToWrite2, &ConvOpts);
-            Assert(cFramesWritten == cFramesToWrite2 + cFramesToWrite1);
-        }
-
-        /*
-         * Advance the buffer position.
-         */
-        pMixBuf->cUsed += cFramesWritten;
-        Assert(pMixBuf->cUsed <= pMixBuf->cFrames);
-
-        pMixBuf->offWrite = (pMixBuf->offWrite + cFramesWritten) % pMixBuf->cFrames;
-        Assert(pMixBuf->offWrite < pMixBuf->cFrames);
-
-        /*
-         * Debug stuff.
-         */
-#ifdef AUDIOMIXBUF_DEBUG_DUMP_PCM_DATA
-        RTFILE fh;
-        RTFileOpen(&fh, AUDIOMIXBUF_DEBUG_DUMP_PCM_DATA_PATH "mixbuf_writecirc_ex.pcm",
-                   RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
-        RTFileWrite(fh, pvBuf, PDMAudioPropsFramesToBytes(pSrcProps, cFramesWritten), NULL);
-        RTFileClose(fh);
-#endif
-    }
-    else
-        rc = VERR_BUFFER_OVERFLOW;
-
-#ifdef DEBUG
-    audioMixBufDbgPrintInternal(pMixBuf, __FUNCTION__);
-    audioMixBufDbgValidate(pMixBuf);
-#endif
-
-    if (pcWritten)
-        *pcWritten = cFramesWritten;
-
-#ifdef AUDMIXBUF_LOG_ENABLED
-    char szTmp[PDMAUDIOPROPSTOSTRING_MAX];
-#endif
-    AUDMIXBUF_LOG(("%s: pSrcProps=%s, cbBuf=%RU32 (%RU32 frames), cFramesWritten=%RU32, rc=%Rrc\n", pMixBuf->pszName,
-                   PDMAudioPropsToString(pSrcProps, szTmp, sizeof(szTmp)), cbBuf, AUDIOMIXBUF_B2F(pMixBuf, cbBuf), cFramesWritten, rc));
-    return rc;
-}
-
-/**
  * Returns the current write position of a mixing buffer.
  *

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

@@ -292 +292 @@
 uint32_t AudioMixBufSize(PAUDIOMIXBUF pMixBuf);
 uint32_t AudioMixBufSizeBytes(PAUDIOMIXBUF pMixBuf);
-int         AudioMixBufWriteCirc(PAUDIOMIXBUF pMixBuf, const void *pvBuf, uint32_t cbBuf, uint32_t *pcWritten);
-int         AudioMixBufWriteCircEx(PAUDIOMIXBUF pMixBuf, PCPDMAUDIOPCMPROPS pSrcProps,
-                                   const void *pvBuf,uint32_t cbBuf, uint32_t *pcWritten);
 uint32_t AudioMixBufWritePos(PAUDIOMIXBUF pMixBuf);
 

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

@@ -272 +272 @@
     for (uint32_t i = 0; i < cToWrite; i++)
     {
-        RTTESTI_CHECK_RC_OK(AudioMixBufWriteCirc(&mb, &aFrames16, sizeof(aFrames16), &cFramesWritten));
+        AudioMixBufWrite(&mb, &WrState, &aFrames16[0], sizeof(aFrames16), 0 /*offDstFrame*/, 1, &cFramesWritten);
         RTTESTI_CHECK(cFramesWritten == 1);
+        AudioMixBufCommit(&mb, cFramesWritten);
     }
     RTTESTI_CHECK(!AudioMixBufIsEmpty(&mb));
@@ -280 +281 @@
     RTTESTI_CHECK(AudioMixBufUsed(&mb) == cToWrite + cFramesWrittenAbs /* + last absolute write */);
 
-    RTTESTI_CHECK_RC_OK(AudioMixBufWriteCirc(&mb, &aFrames16, sizeof(aFrames16), &cFramesWritten));
+    AudioMixBufWrite(&mb, &WrState, &aFrames16[0], sizeof(aFrames16), 0 /*offDstFrame*/, 1, &cFramesWritten);
     RTTESTI_CHECK(cFramesWritten == 1);
+    AudioMixBufCommit(&mb, cFramesWritten);
     RTTESTI_CHECK(AudioMixBufFree(&mb) == 0);
     RTTESTI_CHECK(AudioMixBufFreeBytes(&mb) == AUDIOMIXBUF_F2B(&mb, 0U));
@@ -572 +574 @@
     RTTESTI_CHECK_RC_OK_RETV(AudioMixBufInit(&MixBuf, "NewPeekMixBuf", &CfgSrc, cFrames));
 
+    /* Write state (source). */
+    AUDIOMIXBUFWRITESTATE WriteState;
+    RTTESTI_CHECK_RC_OK_RETV(AudioMixBufInitWriteState(&MixBuf, &WriteState, &CfgSrc));
+
     /* Peek state (destination) is uToHz 2ch S16 */
     PDMAUDIOPCMPROPS const CfgDst = PDMAUDIOPCMPROPS_INITIALIZER(2 /*cbSample*/, true /*fSigned*/, 2 /*ch*/, uToHz, false /*fSwap*/);
@@ -607 +613 @@
 
         uint32_t cSrcFramesWritten = UINT32_MAX / 2;
-        RTTESTI_CHECK_RC_OK_BREAK(AudioMixBufWriteCirc(&MixBuf, &aSrcFrames, cSrcFrames * sizeof(aSrcFrames[0]), &cSrcFramesWritten));
+        AudioMixBufWrite(&MixBuf, &WriteState, &aSrcFrames[0], cSrcFrames * sizeof(aSrcFrames[0]),
+                         0 /*offDstFrame*/, cSrcFrames, &cSrcFramesWritten);
         RTTESTI_CHECK_MSG_BREAK(cSrcFrames == cSrcFramesWritten,
                                 ("cSrcFrames=%RU32 vs cSrcFramesWritten=%RU32 cLiveFrames=%RU32\n",
                                  cSrcFrames, cSrcFramesWritten, AudioMixBufLive(&MixBuf)));
+        AudioMixBufCommit(&MixBuf, cSrcFrames);
 
         /*