Changeset 89335 in vbox for trunk/src/VBox/Devices/Audio/testcase

Timestamp:

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

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Devices/Audio/testcase/tstAudioMixBuffer.cpp (modified) (9 diffs)

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);