Changeset 76880 in vbox for trunk/src/VBox/Devices/Audio/DevIchAc97.cpp

Timestamp:

Jan 18, 2019 10:19:01 AM (6 years ago)

Author:

vboxsync

Message:

Audio/AC97: Simplified ichac97R3StreamTransferCalcNext() a lot, making the A/V synchronization work.

File:

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

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

@@ -1970 +1970 @@
         return 0;
 
-    AssertReturn(DrvAudioHlpPCMPropsAreValid(&pStream->State.Cfg.Props), 0);
-    const uint32_t cbFrame = DrvAudioHlpPCMPropsBytesPerFrame(&pStream->State.Cfg.Props);
-
-    AssertReturn(cbBytes % cbFrame == 0, 0);
-
-    const uint64_t cTicksPerHz    = TMTimerGetFreq((pThis)->DEVAC97_CTX_SUFF_SD(pTimer, pStream->u8SD)) / pStream->State.uTimerHz;
-    const uint64_t cTicksPerByte  = cTicksPerHz / cbBytes;
-    Assert(cTicksPerByte);
-    const uint64_t cTransferTicks = cbBytes * cTicksPerByte;
-
-    LogFunc(("[SD%RU8] Timer %uHz (%RU64 ticks per Hz), cTicksPerByte=%RU64, cbBytes=%RU32 -> cTransferTicks=%RU64\n",
-             pStream->u8SD, pStream->State.uTimerHz, cTicksPerHz, cTicksPerByte, cbBytes, cTransferTicks));
+    const uint64_t usBytes        = DrvAudioHlpBytesToMicro(cbBytes, &pStream->State.Cfg.Props);
+    const uint64_t cTransferTicks = TMTimerFromMicro((pThis)->DEVAC97_CTX_SUFF_SD(pTimer, pStream->u8SD), usBytes);
+
+    LogFunc(("[SD%RU8] Timer %uHz, cbBytes=%RU32 -> usBytes=%RU64, cTransferTicks=%RU64\n",
+             pStream->u8SD, pStream->State.uTimerHz, cbBytes, usBytes, cTransferTicks));
 
     return cTransferTicks;