Changeset 54234 in vbox

Timestamp:

Feb 17, 2015 3:04:53 PM (10 years ago)

Author:

vboxsync

Message:

PDM/Audio: Make HDA emulation work w/ disabled backends.

File:

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

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

@@ -37 +37 @@
 #include <iprt/list.h>
 
-#if 0
-/* Warning: Enabling this causes a *lot* of output! */
 #ifdef LOG_GROUP
 # undef LOG_GROUP
@@ -44 +42 @@
 #define LOG_GROUP LOG_GROUP_DEV_AUDIO
 #include <VBox/log.h>
-#endif
 
 #include "VBoxDD.h"
@@ -2264 +2261 @@
     {
         /* if we enter here we can't report "unreported bits" */
-        rc = VERR_NO_DATA;
+        rc = VINF_EOF;
     }
     else
@@ -2290 +2287 @@
         {
             hdaBackendTransferUnreported(pThis, pBdle, pStreamDesc, cbBackendCopy, pu32Avail);
-            rc = VERR_NO_DATA;
+            rc = VINF_EOF;
         }
     }
@@ -2325 +2322 @@
     if (!cb2Copy)
     {
-        rc = VERR_NO_DATA;
+        rc = VINF_EOF;
     }
     else
@@ -2350 +2347 @@
                 if (pDrv->pConnector->pfnIsActiveOut(pDrv->pConnector, pDrv->Out.pStrmOut))
                 {
-                    rc = pDrv->pConnector->pfnWrite(pDrv->pConnector, pDrv->Out.pStrmOut,
-                                                    pBdle->au8HdaBuffer, cb2Copy + pBdle->cbUnderFifoW,
-                                                    &cbWritten);
-                    if (RT_FAILURE(rc))
+                    int rc2 = pDrv->pConnector->pfnWrite(pDrv->pConnector, pDrv->Out.pStrmOut,
+                                                         pBdle->au8HdaBuffer, cb2Copy + pBdle->cbUnderFifoW,
+                                                         &cbWritten);
+                    if (RT_FAILURE(rc2))
                         continue;
                 }
@@ -2375 +2372 @@
             /* Not enough bytes to be processed and reported, we'll try our luck next time around. */
             hdaBackendTransferUnreported(pThis, pBdle, pStreamDesc, cb2Copy, NULL);
-            rc = VERR_NO_DATA;
+            rc = VINF_EOF;
         }
     }
@@ -2550 +2547 @@
 
     PHDADRIVER pDrv;
-    uint32_t cbIn, cbOut;
+
+    LogFlowFuncEnter();
 
     RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
     {
-        if (!pDrv->pConnector->pfnIsOutputOK(pDrv->pConnector, pDrv->Out.pStrmOut))
-        {
-            pDrv->cSamplesLive = 0;
-            continue;
-        }
-
+        uint32_t cbIn, cbOut;
         rc = pDrv->pConnector->pfnQueryStatus(pDrv->pConnector,
                                               &cbIn, &cbOut, &pDrv->cSamplesLive);
         if (RT_SUCCESS(rc))
         {
-            if (cbIn || cbOut)
-                LogFlowFunc(("\tLUN#%RU8: cbIn=%RU32, cbOut=%RU32\n", pDrv->uLUN, cbIn, cbOut));
+            LogFlowFunc(("\tLUN#%RU8: [1] cbIn=%RU32, cbOut=%RU32\n", pDrv->uLUN, cbIn, cbOut));
+
+            if (pDrv->cSamplesLive)
+            {
+                uint32_t cSamplesPlayed;
+                int rc2 = pDrv->pConnector->pfnPlayOut(pDrv->pConnector, &cSamplesPlayed);
+                if (RT_SUCCESS(rc2))
+                {
+                    LogFlowFunc(("LUN#%RU8: cSamplesLive=%RU32, cSamplesPlayed=%RU32\n",
+                                 pDrv->uLUN, pDrv->cSamplesLive, cSamplesPlayed));
+                    Assert(pDrv->cSamplesLive >= cSamplesPlayed);
+                    pDrv->cSamplesLive -= cSamplesPlayed;
+                }
+
+                rc = pDrv->pConnector->pfnQueryStatus(pDrv->pConnector,
+                                                      &cbIn, &cbOut, &pDrv->cSamplesLive);
+                if (RT_SUCCESS(rc))
+                    LogFlowFunc(("\tLUN#%RU8: [2] cbIn=%RU32, cbOut=%RU32\n", pDrv->uLUN, cbIn, cbOut));
+            }
 
             cbInMax  = RT_MAX(cbInMax, cbIn);
@@ -2574 +2584 @@
     }
 
+    LogFlowFunc(("cbInMax=%RU32, cbOutMin=%RU32\n", cbInMax, cbOutMin));
+
+    if (cbOutMin == UINT32_MAX)
+        cbOutMin = 0;
+
     /*
      * Playback.
@@ -2581 +2596 @@
         Assert(cbOutMin != UINT32_MAX);
         hdaTransfer(pThis, PO_INDEX, cbOutMin); /** @todo Add rc! */
-    }
-    else
-    {
-        RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
-        {
-            /*if (pDrv->cSamplesLive)
-                pDrv->pConnector->pfnPlayOut(pDrv->pConnector);*/
-        }
     }
 
@@ -2598 +2605 @@
 
     TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->uTicks);
+
+    LogFlowFuncLeave();
 
     STAM_PROFILE_STOP(&pThis->StatTimer, a);
@@ -2705 +2714 @@
         hdaStreamCounterUpdate(pThis, pBdle, &StreamDesc, cbWritten);
 
-        if (   !hdaDoNextTransferCycle(pThis, pBdle, &StreamDesc)
-            || RT_FAILURE(rc))
-        {
-            if (rc == VERR_NO_DATA) /* No more data to process. */
-                rc = VINF_SUCCESS;
-
+        if (!hdaDoNextTransferCycle(pThis, pBdle, &StreamDesc))
+            break;
+
+        if (   RT_FAILURE(rc)
+            || rc == VINF_EOF) /* All data processed? */
+        {
             break;
         }