Changeset 89405 in vbox for trunk/src/VBox/Devices

Timestamp:

May 31, 2021 1:58:57 PM (4 years ago)

Author:

vboxsync

Message:

AudioMixBuffer: Fix buggy generic decoders. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixBuffer-Convert.cpp.h (modified) (2 diffs)
• AudioMixBuffer.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Audio/AudioMixBuffer-Convert.cpp.h

@@ -139 +139 @@
             int8_t idxSrc = pState->aidxChannelMap[idxDst];
             if (idxSrc >= 0)
-                pi32Dst[idxDst] = RT_CONCAT(audioMixBufSampleTo,a_Name)(pSrc[idxSrc]);
+                pi32Dst[idxDst] = RT_CONCAT(audioMixBufSampleFrom,a_Name)(pSrc[idxSrc]);
             else if (idxSrc != -2)
                 pi32Dst[idxDst] = (a_fSigned) ? 0 : (a_Max >> 1);
@@ -227 +227 @@
             int8_t idxSrc = pState->aidxChannelMap[idxDst];
             if (idxSrc >= 0)
-                audioMixBufBlendSample(&pi32Dst[idxDst], RT_CONCAT(audioMixBufSampleTo,a_Name)(pSrc[idxSrc]));
+                audioMixBufBlendSample(&pi32Dst[idxDst], RT_CONCAT(audioMixBufSampleFrom,a_Name)(pSrc[idxSrc]));
         }
         pi32Dst += cDstChannels;

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

@@ -1563 +1563 @@
             pState->pfnEncode((uint8_t *)pvDst + cSrcFrames1 * pState->cbDstFrame,
                               &pMixBuf->pi32Samples[0], cMaxSrcFrames - cSrcFrames1, pState);
+
+        //Log9Func(("*pcbDstPeeked=%#x\n%32.*Rhxd\n", *pcbDstPeeked, *pcbDstPeeked, pvDst));
     }
     else
@@ -1659 +1661 @@
         *pcDstFramesWritten = cMaxDstFrames;
 
+        //Log10Func(("cbSrc=%#x\n%32.*Rhxd\n", pState->cbSrcFrame * cMaxDstFrames, pState->cbSrcFrame * cMaxDstFrames, pvSrcBuf));
+
         /* First chunk. */
         uint32_t const cDstFrames1 = RT_MIN(pMixBuf->cFrames - offDstFrame, cMaxDstFrames);
         pState->pfnDecode(&pMixBuf->pi32Samples[offDstFrame * pMixBuf->cChannels], pvSrcBuf, cDstFrames1, pState);
+        //Log8Func(("offDstFrame=%#x cDstFrames1=%#x\n%32.*Rhxd\n", offDstFrame, cDstFrames1,
+        //          cDstFrames1 * pMixBuf->cbFrame, &pMixBuf->pi32Samples[offDstFrame * pMixBuf->cChannels]));
 
         /* Another chunk from the start of the mixing buffer? */
         if (cMaxDstFrames > cDstFrames1)
+        {
             pState->pfnDecode(&pMixBuf->pi32Samples[0], (uint8_t *)pvSrcBuf + cDstFrames1 * pState->cbSrcFrame,
                               cMaxDstFrames - cDstFrames1, pState);
+            //Log8Func(("cDstFrames2=%#x\n%32.*Rhxd\n", cMaxDstFrames - cDstFrames1,
+            //          (cMaxDstFrames - cDstFrames1) * pMixBuf->cbFrame, &pMixBuf->pi32Samples[0]));
+        }
     }
     else