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

Timestamp:

Feb 6, 2018 10:48:43 AM (7 years ago)

Author:

vboxsync

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

120704

Message:

Audio: Renamed AudioMixBufReadCirc[Ex] -> AudioMixBufAcquireReadBlock[Ex] and added AudioMixBufReleaseReadBlock() -- this adds the ability to read less than initially announced, if required.

File:

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

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2014-2017 Oracle Corporation
+ * Copyright (C) 2014-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -136 +136 @@
     for (uint32_t i = 0; i < cToRead; i++)
     {
-        RTTESTI_CHECK_RC_OK(AudioMixBufReadCirc(&mb, &aFrames16, sizeof(aFrames16), &cFramesRead));
+        RTTESTI_CHECK_RC_OK(AudioMixBufAcquireReadBlock(&mb, &aFrames16, sizeof(aFrames16), &cFramesRead));
         RTTESTI_CHECK(cFramesRead == 1);
+        AudioMixBufReleaseReadBlock(&mb, cFramesRead);
         AudioMixBufFinish(&mb, cFramesRead);
     }
@@ -145 +146 @@
     RTTESTI_CHECK(AudioMixBufUsed(&mb) == cBufSize - cToRead);
 
-    RTTESTI_CHECK_RC_OK(AudioMixBufReadCirc(&mb, &aFrames16, sizeof(aFrames16), &cFramesRead));
+    RTTESTI_CHECK_RC_OK(AudioMixBufAcquireReadBlock(&mb, &aFrames16, sizeof(aFrames16), &cFramesRead));
     RTTESTI_CHECK(cFramesRead == 1);
+    AudioMixBufReleaseReadBlock(&mb, cFramesRead);
     AudioMixBufFinish(&mb, cFramesRead);
     RTTESTI_CHECK(AudioMixBufFree(&mb) == cBufSize - cFramesWrittenAbs);
@@ -279 +281 @@
         while (cParentSamples)
         {
-            RTTESTI_CHECK_RC_OK_BREAK(AudioMixBufReadCirc(&parent, pvBuf, cbBuf, &cFramesRead));
+            RTTESTI_CHECK_RC_OK_BREAK(AudioMixBufAcquireReadBlock(&parent, pvBuf, cbBuf, &cFramesRead));
             if (!cFramesRead)
                 break;
 
+            AudioMixBufReleaseReadBlock(&parent, cFramesRead);
             AudioMixBufFinish(&parent, cFramesRead);
 
@@ -379 +382 @@
     for (;;)
     {
-        RTTESTI_CHECK_RC_OK_BREAK(AudioMixBufReadCirc(&parent, achBuf, cbBuf, &cFramesRead));
+        RTTESTI_CHECK_RC_OK_BREAK(AudioMixBufAcquireReadBlock(&parent, achBuf, cbBuf, &cFramesRead));
         if (!cFramesRead)
             break;
         cFramesTotalRead += cFramesRead;
+        AudioMixBufReleaseReadBlock(&parent, cFramesRead);
         AudioMixBufFinish(&parent, cFramesRead);
     }
@@ -477 +481 @@
     for (;;)
     {
-        RTTESTI_CHECK_RC_OK_BREAK(AudioMixBufReadCirc(&parent, achBuf, cbBuf, &cFramesRead));
+        RTTESTI_CHECK_RC_OK_BREAK(AudioMixBufAcquireReadBlock(&parent, achBuf, cbBuf, &cFramesRead));
         if (!cFramesRead)
             break;
         cFramesTotalRead += cFramesRead;
+        AudioMixBufReleaseReadBlock(&parent, cFramesRead);
         AudioMixBufFinish(&parent, cFramesRead);
     }
@@ -567 +572 @@
     for (;;)
     {
-        RTTESTI_CHECK_RC_OK_BREAK(AudioMixBufReadCirc(&parent, achBuf, cbBuf, &cFramesRead));
+        RTTESTI_CHECK_RC_OK_BREAK(AudioMixBufAcquireReadBlock(&parent, achBuf, cbBuf, &cFramesRead));
         if (!cFramesRead)
             break;
         cFramesTotalRead += cFramesRead;
+        AudioMixBufReleaseReadBlock(&parent, cFramesRead);
         AudioMixBufFinish(&parent, cFramesRead);
     }
@@ -598 +604 @@
     for (;;)
     {
-        RTTESTI_CHECK_RC_OK_BREAK(AudioMixBufReadCirc(&parent, achBuf, cbBuf, &cFramesRead));
+        RTTESTI_CHECK_RC_OK_BREAK(AudioMixBufAcquireReadBlock(&parent, achBuf, cbBuf, &cFramesRead));
         if (!cFramesRead)
             break;
         cFramesTotalRead += cFramesRead;
+        AudioMixBufReleaseReadBlock(&parent, cFramesRead);
         AudioMixBufFinish(&parent, cFramesRead);
     }