Changeset 87965 in vbox for trunk/src/VBox

Timestamp:

Mar 4, 2021 11:43:30 PM (4 years ago)

Author:

vboxsync

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

143068

Message:

DevHDA: Use pStreamR3->State.Mapping.PCMProps instead of pStreamShared->State.Cfg.Prop for the guest facing side (gst:5.1 -> host:stereo). bugref:9890

File:

• trunk/src/VBox/Devices/Audio/HDAStream.cpp (modified) (2 diffs)

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

@@ -530 +530 @@
             pStreamShared->State.cbTransferSize  = cbTransferHeuristics;
             pStreamShared->State.cbTransferChunk = cbTransferHeuristics; /* no chunking */
-            ASSERT_GUEST_LOGREL_MSG(DrvAudioHlpBytesIsAligned(cbTransferHeuristics, &pCfg->Props),
+            ASSERT_GUEST_LOGREL_MSG(DrvAudioHlpBytesIsAligned(cbTransferHeuristics, &pStreamR3->State.Mapping.PCMProps),
                                     ("We arrived at a misaligned transfer size for stream #%RU8: %#x (%u)\n",
                                      uSD, cbTransferHeuristics, cbTransferHeuristics));
@@ -536 +536 @@
             /* Convert to timer ticks. */
             uint64_t const cTimerTicksPerSec = PDMDevHlpTimerGetFreq(pDevIns, pStreamShared->hTimer);
-            uint64_t const cbTransferPerSec  = RT_MAX(pStreamShared->State.Cfg.Props.uHz * pStreamR3->State.Mapping.cbFrameSize,
+            uint64_t const cbTransferPerSec  = RT_MAX(pStreamR3->State.Mapping.PCMProps.uHz * pStreamR3->State.Mapping.cbFrameSize,
                                                       4096 /* zero div prevention: min is 6kHz, picked 4k in case I'm mistaken */);
+
             pStreamShared->State.cTicksPerByte = (cTimerTicksPerSec + cbTransferPerSec / 2) / cbTransferPerSec;
             AssertStmt(pStreamShared->State.cTicksPerByte, pStreamShared->State.cTicksPerByte = 4096);