Changeset 89376 in vbox for trunk/src/VBox

Timestamp:

May 30, 2021 12:16:29 AM (4 years ago)

Author:

vboxsync

Message:

AudioMixBuffer,tstAudioMixBuffer: Fixed copy&paste bug in audioMixBufBlendBuffer, enabled related tests. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

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

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

@@ -273 +273 @@
             while (cFrames-- > 0)
             {
-                audioMixBufBlendSample(&pi64Dst[0], pi64Dst[0]);
-                audioMixBufBlendSample(&pi64Dst[1], pi64Dst[1]);
+                audioMixBufBlendSample(&pi64Dst[0], pi64Src[0]);
+                audioMixBufBlendSample(&pi64Dst[1], pi64Src[1]);
                 pi64Dst += 2;
                 pi64Src += 2;
@@ -286 +286 @@
             while (cFrames-- > 0)
             {
-                audioMixBufBlendSample(pi64Dst, pi64Dst[0]);
+                audioMixBufBlendSample(pi64Dst, pi64Src[0]);
                 pi64Dst++;
                 pi64Src++;
@@ -1741 +1741 @@
      * First chunk.
      */
-    uint32_t cChunk = RT_MIN(pMixBuf->cFrames - offFrame, cFrames);
-    RT_BZERO(&pMixBuf->pFrames[offFrame], cChunk * sizeof(pMixBuf->pFrames[0]));
-    cFrames -= cChunk;
+    uint32_t const cFramesChunk1 = RT_MIN(pMixBuf->cFrames - offFrame, cFrames);
+    RT_BZERO(&pMixBuf->pFrames[offFrame], cFramesChunk1 * sizeof(pMixBuf->pFrames[0]));
 
     /*
      * Second chunk, if needed.
      */
-    if (cFrames > 0)
-    {
+    if (cFrames > cFramesChunk1)
+    {
+        cFrames -= cFramesChunk1;
         AssertStmt(cFrames <= pMixBuf->cFrames, cFrames = pMixBuf->cFrames);
         RT_BZERO(&pMixBuf->pFrames[0], cFrames * sizeof(pMixBuf->pFrames[0]));

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

@@ -469 +469 @@
                     break;
 
-#if 0 /** @todo doesn't work for some U64 variations */
                 case 1: /* zero & blend */
                     AudioMixBufSilence(&MixBuf, &WriteStateIgnZero, 0 /*offFrame*/, cSrcFramesToWrite);
@@ -476 +475 @@
                     RTTESTI_CHECK(cFrames == cSrcFramesToWrite);
                     break;
-#endif
 
                 case 2: /* blend same equal data twice */