Changeset 54482 in vbox for trunk/src/VBox

Timestamp:

Feb 25, 2015 11:40:56 AM (10 years ago)

Author:

vboxsync

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

98590

Message:

Audio/AudioMixBuffer: Bugfixes, updated testcase.

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixBuffer.cpp (modified) (10 diffs)
• testcase/tstAudioMixBuffer.cpp (modified) (4 diffs)

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

@@ -19 +19 @@
 #include <iprt/asm-math.h>
 #include <iprt/assert.h>
-#ifdef DEBUG_andy
+#ifdef DEBUG_DUMP_PCM_DATA
 # include <iprt/file.h>
 #endif
 #include <iprt/mem.h>
 #include <iprt/string.h> /* For RT_BZERO. */
+
+#ifdef LOG_GROUP
+# undef LOG_GROUP
+#endif
+#define LOG_GROUP LOG_GROUP_DEV_AUDIO
+#include <VBox/log.h>
+
 #ifdef TESTCASE
+# define LOG_ENABLED
 # include <iprt/stream.h>
 #endif
@@ -31 +39 @@
 #include "AudioMixBuffer.h"
 
-#ifdef LOG_GROUP
-# undef LOG_GROUP
-#endif
 #if 0
 # define AUDMIXBUF_LOG(x) LogFlowFunc(x)
-# define LOG_GROUP LOG_GROUP_DEV_AUDIO
-# include <VBox/log.h>
 #else
-# define AUDMIXBUF_LOG(x) do {} while (0)
+# if defined(TESTCASE)
+#  define AUDMIXBUF_LOG(x) LogFunc(x)
+# else
+#  define AUDMIXBUF_LOG(x) do {} while (0)
+# endif
 #endif
 
@@ -126 +133 @@
                        pIter->pszName, pIter->cMixed, pIter->cMixed - cSamplesToClear));
 
-        Assert(pIter->cMixed >= cSamplesToClear);
-        pIter->cMixed -= cSamplesToClear;
+        pIter->cMixed -= RT_MIN(pIter->cMixed, cSamplesToClear);
         pIter->offReadWrite = 0;
     }
@@ -376 +382 @@
         while (paDst < paDstEnd) \
         { \
-            if (paSrc >= paSrcEnd) \
-                break; \
-            \
             while (pRate->srcOffset <= (pRate->dstOffset >> 32)) \
             { \
-                AUDMIXBUF_MACRO_LOG(("foo1\n")); \
                 samLast = *paSrc++; \
                 pRate->srcOffset++; \
@@ -387 +389 @@
                 if (paSrc >= paSrcEnd) \
                     break; \
-                    AUDMIXBUF_MACRO_LOG(("foo1.1\n")); \
             } \
-            AUDMIXBUF_MACRO_LOG(("foo2\n")); \
             \
             samCur = *paSrc; \
@@ -410 +410 @@
             \
             AUDMIXBUF_MACRO_LOG(("\t\tpRate->dstOffset=%RU64\n", pRate->dstOffset)); \
+            \
+            if (paSrc >= paSrcEnd) \
+                break; \
+            \
         } \
         \
@@ -903 +907 @@
 {
     AssertPtrReturn(pMixBuf, 0);
+
+    AUDMIXBUF_LOG(("%s: cProcessed=%RU32\n", pMixBuf->pszName, pMixBuf->cProcessed));
     return pMixBuf->cProcessed;
 }
@@ -970 +976 @@
         return VINF_SUCCESS;
 
-    uint32_t cToRead = RT_MIN(AUDIOMIXBUF_B2S(pMixBuf, cbBuf),
-                              pMixBuf->cProcessed);
+    uint32_t cToRead = RT_MIN(AUDIOMIXBUF_B2S(pMixBuf, cbBuf), pMixBuf->cProcessed);
 
     AUDMIXBUF_LOG(("%s: pvBuf=%p, cbBuf=%zu (%RU32 samples), cToRead=%RU32\n",
-                   pMixBuf->pszName, pvBuf,
-                   cbBuf, AUDIOMIXBUF_B2S(pMixBuf, cbBuf), cToRead));
+                   pMixBuf->pszName, pvBuf, cbBuf, AUDIOMIXBUF_B2S(pMixBuf, cbBuf), cToRead));
 
     if (!cToRead)
@@ -1167 +1171 @@
     uint32_t cWritten;
 
-#if 0
+#ifdef DEBUG_DUMP_PCM_DATA
     RTFILE fh;
     rc = RTFileOpen(&fh, "c:\\temp\\test_writeat.pcm",
@@ -1285 +1289 @@
     }
 
-#if 0
+#ifdef DEBUG_DUMP_PCM_DATA
         RTFILE fh;
         RTFileOpen(&fh, "c:\\temp\\test_writeex.pcm",

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

@@ -23 +23 @@
 #include <iprt/initterm.h>
 #include <iprt/mem.h>
+#include <iprt/rand.h>
 #include <iprt/stream.h>
 #include <iprt/string.h>
@@ -152 +153 @@
     RTTESTI_CHECK_RC_OK(audioMixBufInit(&parent, "Parent", &props, cBufSize));
 
-    PDMAUDIOSTREAMCFG cfg_c1 = /* Downmixing */
+    PDMAUDIOSTREAMCFG cfg_c1 = /* Upmixing to parent */
     {
         22100,                   /* Hz */
@@ -167 +168 @@
     RTTESTI_CHECK_RC_OK(audioMixBufLinkTo(&child1, &parent));
 
-    PDMAUDIOSTREAMCFG cfg_c2 = /* Upmixing */
+    PDMAUDIOSTREAMCFG cfg_c2 = /* Downmixing to parent */
     {
         48000,                   /* Hz */
@@ -187 +188 @@
     size_t cbBuf = _1K;
     char pvBuf[_1K];
-    int16_t samples16[32] = { 0xAA, 0xBB };
-    uint32_t read , written, proc, mixed;
-
+    int16_t samples[32] = { 0xAA, 0xBB };
+    uint32_t free, read , written, proc, mixed, temp;
+
+    uint32_t cChild1Free     = cBufSize;
+    uint32_t cChild1Mixed    = 0;
     uint32_t cSamplesParent1 = 16;
     uint32_t cSamplesChild1  = 16;
-    uint32_t cSamplesParent2 = 32;
+
+    uint32_t cChild2Free     = cBufSize;
+    uint32_t cChild2Mixed    = 0;
+    uint32_t cSamplesParent2 = 16;
     uint32_t cSamplesChild2  = 16;
 
-    for (int i = 0; i < 32; i++)
-    {
-        RTTESTI_CHECK_RC_OK(audioMixBufWriteAt(&child1, 0, &samples16, sizeof(samples16), &written));
-        RTTESTI_CHECK(written == cSamplesChild1);
-        RTTESTI_CHECK_RC_OK(audioMixBufMixToParent(&child1, written, &mixed));
-        RTTESTI_CHECK(mixed == cSamplesChild1);
-
-        RTTESTI_CHECK_RC_OK(audioMixBufReadCirc(&parent, pvBuf, cbBuf, &read));
-        RTTESTI_CHECK(read == 31);
-
-        RTTESTI_CHECK_RC_OK(audioMixBufWriteAt(&child2, 0, &samples16, sizeof(samples16), &written));
-        RTTESTI_CHECK(written == cSamplesChild2);
-        RTTESTI_CHECK_RC_OK(audioMixBufMixToParent(&child2, written, &mixed));
-        RTTESTI_CHECK(mixed == cSamplesChild2);
-
-        RTTESTI_CHECK_RC_OK(audioMixBufReadCirc(&parent, pvBuf, cbBuf, &read));
-        RTTESTI_CHECK(read == 15);
+    uint32_t t = RTRandU32() % 64;
+
+    for (uint32_t i = 0; i < t; i++)
+    {
+        RTTestPrintf(hTest, RTTESTLVL_DEBUG, "i=%RU32\n", i);
+        RTTESTI_CHECK_RC_OK_BREAK(audioMixBufWriteAt(&child1, 0, &samples, sizeof(samples), &written));
+        RTTESTI_CHECK_MSG_BREAK(written == cSamplesChild1, ("Child1: Expected %RU32 written samples, got %RU32\n", cSamplesChild1, written));
+        RTTESTI_CHECK_RC_OK_BREAK(audioMixBufMixToParent(&child1, written, &mixed));
+        temp = audioMixBufProcessed(&parent) - audioMixBufMixed(&child2);
+        RTTESTI_CHECK_MSG_BREAK(audioMixBufMixed(&child1) == temp, ("Child1: Expected %RU32 mixed samples, got %RU32\n", audioMixBufMixed(&child1), temp));
+
+        RTTESTI_CHECK_RC_OK_BREAK(audioMixBufWriteAt(&child2, 0, &samples, sizeof(samples), &written));
+        RTTESTI_CHECK_MSG_BREAK(written == cSamplesChild2, ("Child2: Expected %RU32 written samples, got %RU32\n", cSamplesChild2, written));
+        RTTESTI_CHECK_RC_OK_BREAK(audioMixBufMixToParent(&child2, written, &mixed));
+        temp = audioMixBufProcessed(&parent) - audioMixBufMixed(&child1);
+        RTTESTI_CHECK_MSG_BREAK(audioMixBufMixed(&child2) == temp, ("Child2: Expected %RU32 mixed samples, got %RU32\n", audioMixBufMixed(&child2), temp));
+    }
+
+    RTTESTI_CHECK(audioMixBufProcessed(&parent) == audioMixBufMixed(&child1) + audioMixBufMixed(&child2));
+
+    for (;;)
+    {
+        RTTESTI_CHECK_RC_OK_BREAK(audioMixBufReadCirc(&parent, pvBuf, cbBuf, &read));
+        if (!read)
+            break;
+        audioMixBufFinish(&parent, read);
     }
 
     RTTESTI_CHECK(audioMixBufProcessed(&parent) == 0);
+    RTTESTI_CHECK(audioMixBufMixed(&child1) == 0);
+    RTTESTI_CHECK(audioMixBufMixed(&child2) == 0);
 
     return RTTestSubErrorCount(hTest) ? VERR_GENERAL_FAILURE : VINF_SUCCESS;