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

Timestamp:

Dec 13, 2017 5:37:31 PM (7 years ago)

Author:

vboxsync

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

119666

Message:

Audio/HDA: Only do stream tagging when enabling a stream and use stream tags when doing lookups via hdaGetStreamFromSD(). Needd for macOS guests.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHDA.cpp (modified) (2 diffs)
• DevHDACommon.cpp (modified) (1 diff)
• HDAStream.cpp (modified) (1 diff)

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

@@ -1322 +1322 @@
              uSD, fRun, fInRun, fReset, fInReset, u32Value));
 
-    /*
-     * Extract the stream tag the guest wants to use for this specific
-     * stream descriptor (SDn). This only can happen if the stream is in a non-running
-     * state, so we're doing the lookup and assignment here.
-     *
-     * So depending on the guest OS, SD3 can use stream tag 4, for example.
-     */
-    uint8_t uTag = (u32Value >> HDA_SDCTL_NUM_SHIFT) & HDA_SDCTL_NUM_MASK;
-    if (uTag > HDA_MAX_TAGS)
-    {
-        LogFunc(("[SD%RU8] Warning: Invalid stream tag %RU8 specified!\n", uSD, uTag));
-
-        DEVHDA_UNLOCK_BOTH(pThis);
-        return hdaRegWriteU24(pThis, iReg, u32Value);
-    }
-
-    PHDATAG pTag = &pThis->aTags[uTag];
-    AssertPtr(pTag);
-
-    LogFunc(("[SD%RU8] Using stream tag=%RU8\n", uSD, uTag));
-
-    /* Assign new values. */
-    pTag->uTag    = uTag;
-    pTag->pStream = hdaGetStreamFromSD(pThis, uSD);
-
-    PHDASTREAM pStream = pTag->pStream;
-    AssertPtr(pStream);
+    PHDASTREAM pStream = hdaGetStreamFromSD(pThis, uSD);
+    AssertPtr(pStream);   
 
     if (fInReset)
@@ -1394 +1369 @@
 
             hdaStreamLock(pStream);
+
+            /*
+             * Extract the stream tag the guest wants to use for this specific
+             * stream descriptor (SDn). This only can happen if the stream is in a non-running
+             * state, so we're doing the lookup and assignment here.
+             *
+             * So depending on the guest OS, SD3 can use stream tag 4, for example.
+             */
+            uint8_t uTag = (u32Value >> HDA_SDCTL_NUM_SHIFT) & HDA_SDCTL_NUM_MASK;
+
+            LogFunc(("[SD%RU8] Using stream tag=%RU8\n", uSD, uTag));
+
+            if (   !uTag 
+                || uTag > HDA_MAX_TAGS)
+            {
+                LogRel(("HDA: Warning: Stream #%RU8 is using invalid stream tag %RU8, skipping SDCTL\n", uSD, uTag));
+
+                DEVHDA_UNLOCK_BOTH(pThis);
+                return hdaRegWriteU24(pThis, iReg, u32Value);
+            }
+
+            LogRel2(("HDA: Stream #%RU8 is stream tag %RU8\n", uSD, uTag));
+            
+            /* Our internal mapping table is zero-based. */
+            PHDATAG pTag = &pThis->aTags[uTag - 1];
+            AssertPtr(pTag);
+
+            /* Assign new values. */
+            pTag->uTag    = uTag;
+            pTag->pStream = pStream;
 
 # ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO

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

@@ -224 +224 @@
     }
 
+    /* First, check if the SD# is in our tag mapping and return the
+     * correlating stream instead.
+     *  
+     * Note that our internal table is zero-based. */
+    PHDASTREAM pStream = pThis->aTags[uSD ? uSD - 1 : 0].pStream;
+    if (pStream)
+        return pStream;
+
+    /* No tagged stream found, just return the plain non-tagged SD# stream. */
     return &pThis->aStreams[uSD];
 }

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

@@ -242 +242 @@
 
         /** @todo Use a more dynamic fragment size? */
-        uint8_t cFragments = pStream->u16LVI;
+        uint8_t cFragments = pStream->u16LVI + 1;
         if (cFragments <= 1)
             cFragments = 2; /* At least two fragments (BDLEs) must be present. */