Changeset 75983 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Dec 5, 2018 4:35:32 PM (6 years ago)

Author:

vboxsync

Message:

Audio/HDA: Use a dedicated default value for the stream position adjustment (needed for resetting the stream).

Location:

trunk/src/VBox/Devices/Audio

Files:

• HDAStream.cpp (modified) (7 diffs)
• HDAStream.h (modified) (1 diff)

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

@@ -402 +402 @@
 
                 /* Initialize position adjustment counter. */
-                pStream->State.cPosAdjustFramesLeft = cfPosAdjust;
-                LogRel2(("HDA: Position adjustment for stream #%RU8 active (%RU32 frames)\n", pStream->u8SD, cfPosAdjust));
+                pStream->State.cfPosAdjustDefault = cfPosAdjust;
+                pStream->State.cfPosAdjustLeft    = pStream->State.cfPosAdjustDefault;
+
+                LogRel2(("HDA: Position adjustment for stream #%RU8 active (%RU32 frames)\n",
+                         pStream->u8SD, pStream->State.cfPosAdjustDefault));
             }
         }
@@ -507 +510 @@
     pStream->pMixSink = hdaR3GetDefaultSink(pThis, uSD);
 
+    /* Reset position adjustment counter. */
+    pStream->State.cfPosAdjustLeft = pStream->State.cfPosAdjustDefault;
+
     /* Reset transfer stuff. */
     pStream->State.cbTransferProcessed        = 0;
@@ -963 +969 @@
         /* If there are position adjustment frames left to be processed,
          * make sure that we process them first as a whole. */
-        if (pStream->State.cPosAdjustFramesLeft)
-            cbChunk = RT_MIN(cbChunk, uint32_t(pStream->State.cPosAdjustFramesLeft * pStream->State.Mapping.cbFrameSize));
+        if (pStream->State.cfPosAdjustLeft)
+            cbChunk = RT_MIN(cbChunk, uint32_t(pStream->State.cfPosAdjustLeft * pStream->State.Mapping.cbFrameSize));
 
         Log3Func(("[SD%RU8] cbChunk=%RU32, cPosAdjustFramesLeft=%RU16\n",
-                  pStream->u8SD, cbChunk, pStream->State.cPosAdjustFramesLeft));
+                  pStream->u8SD, cbChunk, pStream->State.cfPosAdjustLeft));
 
         if (!cbChunk)
@@ -1168 +1174 @@
             /* Are we done doing the position adjustment?
              * Only then do the transfer accounting .*/
-            if (pStream->State.cPosAdjustFramesLeft == 0)
+            if (pStream->State.cfPosAdjustLeft == 0)
             {
                 Assert(cbLeft >= cbDMA);
@@ -1199 +1205 @@
                  *
                  * In such a case we need to skip such an interrupt and just move on. */
-                && pStream->State.cPosAdjustFramesLeft == 0)
+                && pStream->State.cfPosAdjustLeft == 0)
             {
                 /* If the IOCE ("Interrupt On Completion Enable") bit of the SDCTL register is set
@@ -1226 +1232 @@
 
         /* Do the position adjustment accounting. */
-        pStream->State.cPosAdjustFramesLeft -=
-            RT_MIN(pStream->State.cPosAdjustFramesLeft, cbDMA / pStream->State.Mapping.cbFrameSize);
+        pStream->State.cfPosAdjustLeft -=
+            RT_MIN(pStream->State.cfPosAdjustLeft, cbDMA / pStream->State.Mapping.cbFrameSize);
 
         if (RT_FAILURE(rc))
@@ -1242 +1248 @@
     /* Only do the data accounting if we don't have to do any position
      * adjustment anymore. */
-    if (pStream->State.cPosAdjustFramesLeft == 0)
+    if (pStream->State.cfPosAdjustLeft == 0)
     {
         hdaR3StreamPeriodInc(pPeriod, RT_MIN(cbProcessed / pStream->State.Mapping.cbFrameSize,

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

@@ -151 +151 @@
     uint8_t                 cTransferPendingInterrupts;
     uint8_t                 Padding2[4];
+    /** Number of audio data frames for the position adjustment.
+     *  0 if no position adjustment is needed. */
+    uint16_t                cfPosAdjustDefault;
     /** How many audio data frames are left to be processed
      *  for the position adjustment handling.
      *
      *  0 if position adjustment handling is done or inactive. */
-    uint16_t                cPosAdjustFramesLeft;
-    uint8_t                 Padding3[2];
+    uint16_t                cfPosAdjustLeft;
     /** (Virtual) clock ticks per byte. */
     uint64_t                cTicksPerByte;