Changeset 69946 in vbox

Timestamp:

Dec 6, 2017 9:35:18 AM (7 years ago)

Author:

vboxsync

Message:

Audio/HDA: Logging.

File:

• trunk/src/VBox/Devices/Audio/HDAStream.cpp (modified) (3 diffs)

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

@@ -721 +721 @@
     uint32_t cbToProcess = RT_MIN(pStream->State.cbTransferSize - pStream->State.cbTransferProcessed,
                                   pStream->State.cbTransferChunk);
+
+    Log3Func(("[SD%RU8] cbToProcess=%RU32, cbToProcessMax=%RU32\n", pStream->u8SD, cbToProcess, cbToProcessMax));
+
+    if (cbToProcess > cbToProcessMax)
+    {
+        if (pStream->State.Cfg.enmDir == PDMAUDIODIR_IN)
+            LogRelMax2(64, ("HDA: Warning: FIFO underflow for stream #%RU8 (still %RU32 bytes needed)\n",
+                            pStream->u8SD, cbToProcess - cbToProcessMax));
+        else
+            LogRelMax2(64, ("HDA: Warning: FIFO overflow for stream #%RU8 (%RU32 bytes outstanding)\n",
+                            pStream->u8SD, cbToProcess - cbToProcessMax));
+
+        LogFunc(("[SD%RU8] Warning: Limiting transfer (cbToProcess=%RU32, cbToProcessMax=%RU32)\n",
+                 pStream->u8SD, cbToProcess, cbToProcessMax));
+
+        /* Never process more than a stream currently can handle. */
+        cbToProcess = cbToProcessMax;
+    }
+
     uint32_t cbProcessed = 0;
     uint32_t cbLeft      = cbToProcess;
     Assert(cbLeft % HDA_FRAME_SIZE == 0);
-
-    if (cbToProcess > cbToProcessMax)
-        LogRel2(("HDA: More data to process\n"));
-
-    Log3Func(("[SD%RU8] cbToProcess=%RU32\n", pStream->u8SD, cbToProcess));
 
     uint8_t abChunk[HDA_FIFO_MAX + 1];
@@ -781 +795 @@
             if (cbDMAToWrite)
             {
-                LogRel2(("HDA: FIFO underflow for stream #%RU8 (%RU32 bytes outstanding)\n", pStream->u8SD, cbDMAToWrite));
-
                 Assert(cbChunk == cbDMAWritten + cbDMAToWrite);
                 memset((uint8_t *)abChunk + cbDMAWritten, 0, cbDMAToWrite);
@@ -806 +818 @@
                 if (cbDMALeft > RTCircBufFree(pCircBuf))
                 {
-                    LogRel2(("HDA: FIFO overflow for stream #%RU8 (%RU32 bytes outstanding)\n",
-                             pStream->u8SD, cbDMALeft - RTCircBufFree(pCircBuf)));
-
                     /* Try to read as much as possible. */
                     cbDMALeft = (uint32_t)RTCircBufFree(pCircBuf);