Changeset 82566 in vbox

Timestamp:

Dec 12, 2019 9:13:08 AM (5 years ago)

Author:

vboxsync

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

135440

Message:

Audio/HDA: Forward-ported / integrated r135420 (5.2: Audio/HDA: Skip the current DMA chunk if the chunk is smaller than what the current stream mapping needs to read the next associated frame). bugref:9624

File:

• trunk/src/VBox/Devices/Audio/HDAStream.cpp (modified) (1 diff)

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

@@ -1132 +1132 @@
                                   m, cbDMA, cbFrame, pMap->offNext));
 
+
+                        /* Skip the current DMA chunk if the chunk is smaller than what the current stream mapping needs to read
+                         * the next associated frame (pointed to at pMap->cbOff).
+                         *
+                         * This can happen if the guest did not come up with enough data within a certain time period, especially
+                         * when using multi-channel speaker (> 2 channels [stereo]) setups. */
+                        if (pMap->offNext > cbChunk)
+                        {
+                            Log2Func(("Mapping #%u: Skipped (cbChunk=%RU32, cbMapOff=%RU32)\n", m, cbChunk, pMap->offNext));
+                            continue;
+                        }
+
                         uint8_t *pbSrcBuf = abChunk;
                         size_t cbSrcOff   = pMap->offNext;
-                        Assert(cbChunk >= cbSrcOff);
 
                         for (unsigned i = 0; i < cbDMA / cbFrame; i++)