Changeset 59182 in vbox for trunk/src/VBox/Devices/Audio/DevIchHda.cpp

Timestamp:

Dec 18, 2015 1:24:53 PM (9 years ago)

Author:

vboxsync

Message:

DevIchHda.cpp: Use the time at the start of the hdaTimer callback when rescheduling it. Use the TMTimerGet* functions instead of the PDMDevHlp variants. Some documentation amendments.

File:

• trunk/src/VBox/Devices/Audio/DevIchHda.cpp (modified) (9 diffs)

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

@@ -737 +737 @@
     bool                               fRCEnabled;
 #ifndef VBOX_WITH_AUDIO_CALLBACKS
-    /** The emulation timer for handling the attached
-     *  LUN drivers. */
+    /** The timer for pumping data thru the attached LUN drivers. */
     PTMTIMERR3                         pTimer;
-    /** Timer ticks for handling the LUN drivers. */
-    uint64_t                           uTimerTicks;
-    /** Timestamp (delta) since last timer call. */
+    /** The timer interval for pumping data thru the LUN drivers in timer ticks. */
+    uint64_t                           cTimerTicks;
+    /** Timestamp of the last timer callback (hdaTimer).
+     * Used to calculate the time actually elapsed between two timer callbacks. */
     uint64_t                           uTimerTS;
 #endif
@@ -756 +756 @@
     union
     {
-        /** List of associated LUN drivers. */
+        /** List of associated LUN drivers (HDADRIVER). */
         RTLISTANCHOR                   lstDrv;
         /** Padding for alignment. */
@@ -3028 +3028 @@
 static DECLCALLBACK(void) hdaTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
-    PHDASTATE pThis = PDMINS_2_DATA(pDevIns, PHDASTATE);
-    AssertPtrReturnVoid(pThis);
+    PHDASTATE pThis = (PHDASTATE)pvUser;
+    Assert(pThis == PDMINS_2_DATA(pDevIns, PHDASTATE));
+    AssertPtr(pThis);
 
     STAM_PROFILE_START(&pThis->StatTimer, a);
-
-    int rc = VINF_SUCCESS;
 
     uint32_t cbInMax  = 0;
@@ -3040 +3039 @@
     PHDADRIVER pDrv;
 
-    uint32_t cbIn, cbOut;
-
-    uint64_t uTicksNow     = PDMDevHlpTMTimeVirtGet(pDevIns);
-    uint64_t uTicksElapsed = uTicksNow  - pThis->uTimerTS;
-    uint64_t uTicksPerSec  = PDMDevHlpTMTimeVirtGetFreq(pDevIns);
+    uint64_t uTicksNow     = TMTimerGet(pTimer);
+    uint64_t cTicksElapsed = uTicksNow  - pThis->uTimerTS;
+    uint64_t cTicksPerSec  = TMTimerGetFreq(pTimer);
 
     pThis->uTimerTS = uTicksNow;
@@ -3050 +3047 @@
     RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
     {
-        cbIn = cbOut = 0;
-        rc = pDrv->pConnector->pfnQueryStatus(pDrv->pConnector,
-                                              &cbIn, &cbOut, NULL /* cSamplesLive */);
+        uint32_t cbIn = 0;
+        uint32_t cbOut = 0;
+
+        int rc = pDrv->pConnector->pfnQueryStatus(pDrv->pConnector, &cbIn, &cbOut, NULL /* pcSamplesLive */);
         if (RT_SUCCESS(rc))
-            rc = pDrv->pConnector->pfnPlayOut(pDrv->pConnector, NULL /* cSamplesPlayed */);
+            rc = pDrv->pConnector->pfnPlayOut(pDrv->pConnector, NULL /* pcSamplesPlayed */);
 
 #ifdef DEBUG_TIMER
@@ -3070 +3068 @@
             || !fIsActiveOut)
         {
-            uint32_t cSamplesMin  = (int)((2 * uTicksElapsed * pDrv->Out.pStrmOut->Props.uHz + uTicksPerSec) / uTicksPerSec / 2);
+            uint32_t cSamplesMin  = (int)((2 * cTicksElapsed * pDrv->Out.pStrmOut->Props.uHz + cTicksPerSec) / cTicksPerSec / 2);
             uint32_t cbSamplesMin = AUDIOMIXBUF_S2B(&pDrv->Out.pStrmOut->MixBuf, cSamplesMin);
 
@@ -3095 +3093 @@
 
     /* Kick the timer again. */
-    TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->uTimerTicks);
+    uint64_t cTicks = pThis->cTimerTicks;
+    /** @todo adjust cTicks down by now much cbOutMin represents. */
+    TMTimerSet(pThis->pTimer, uTicksNow + cTicks);
 
     STAM_PROFILE_STOP(&pThis->StatTimer, a);
@@ -4174 +4174 @@
     if (pThis->pTimer)
     {
-        rc2 = TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->uTimerTicks);
+        rc2 = TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->cTimerTicks);
         AssertRC(rc2);
     }
@@ -4632 +4632 @@
         {
             /** @todo Investigate why sounds is getting corrupted if the "ticks" value is too
-             *        low, e.g. "PDMDevHlpTMTimeVirtGetFreq / 200". */
-            pThis->uTimerTicks = PDMDevHlpTMTimeVirtGetFreq(pDevIns) / 500; /** @todo Make this configurable! */
-            pThis->uTimerTS    = PDMDevHlpTMTimeVirtGet(pDevIns);
-            if (pThis->uTimerTicks < 100)
-                pThis->uTimerTicks = 100;
-            LogFunc(("Timer ticks=%RU64\n", pThis->uTimerTicks));
+             *        low, e.g. "PDMDevHlpTMTimeVirtGetFreq / 200".
+             *  Update: Because the guest doesn't prepare enough data at a time. */
+            pThis->cTimerTicks = TMTimerGetFreq(pThis->pTimer) / 500; /** @todo Make this configurable! */
+            pThis->uTimerTS    = TMTimerGet(pThis->pTimer);
+            LogFunc(("Timer ticks=%RU64\n", pThis->cTimerTicks));
 
             /* Fire off timer. */
-            TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->uTimerTicks);
+            TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->cTimerTicks);
         }
     }