Changeset 73213 in vbox

Timestamp:

Jul 18, 2018 3:27:05 PM (7 years ago)

Author:

vboxsync

Message:

Audio/HDA: A bit of renaming / docs.

File:

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

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

@@ -888 +888 @@
     {
         if (pStream->State.Cfg.enmDir == PDMAUDIODIR_IN)
-            LogRelMax2(64, ("HDA: Warning: FIFO underflow for stream #%RU8 (still %RU32 bytes needed)\n",
+            LogRelMax2(64, ("HDA: Warning: DMA buffer 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",
+            LogRelMax2(64, ("HDA: Warning: DMA buffer overflow for stream #%RU8 (%RU32 bytes outstanding)\n",
                             pStream->u8SD, cbToProcess - cbToProcessMax));
 
@@ -977 +977 @@
             if (RT_SUCCESS(rc))
             {
+                const uint32_t cbDMAFree = (uint32_t)RTCircBufFree(pCircBuf);
+
+                if (cbDMAFree < cbDMA)
+                    LogRelMax2(64, ("HDA: Warning: DMA buffer overflow of stream #%RU8 (discarding %RU32 bytes)\n",
+                               pStream->u8SD, cbDMA - cbDMAFree));
+
 #ifndef VBOX_WITH_HDA_AUDIO_INTERLEAVING_STREAMS_SUPPORT
                 /*
@@ -988 +994 @@
                 {
                     uint32_t cbDMARead = 0;
-                    uint32_t cbDMALeft = RT_MIN(cbDMA, (uint32_t)RTCircBufFree(pCircBuf));
+                    uint32_t cbDMALeft = RT_MIN(cbDMA, cbDMAFree);
 
                     while (cbDMALeft)
@@ -1021 +1027 @@
                     /** @todo Optimize this stuff -- copying only one frame a time is expensive. */
                     uint32_t cbDMARead = pStream->State.cbDMALeft ? pStream->State.cbFrameSize - pStream->State.cbDMALeft : 0;
-                    uint32_t cbDMALeft = RT_MIN(cbDMA, (uint32_t)RTCircBufFree(pCircBuf));
+                    uint32_t cbDMALeft = RT_MIN(cbDMA, cbDMAFree);
 
                     while (cbDMALeft >= pStream->State.cbFrameSize)
@@ -1043 +1049 @@
                     Assert(pStream->State.cbDMALeft < pStream->State.cbFrameSize);
                 }
-
-                const size_t cbFree = RTCircBufFree(pCircBuf);
-                if (!cbFree)
-                    LogRel2(("HDA: FIFO of stream #%RU8 full, discarding audio data\n", pStream->u8SD));
 #else
                 /** @todo This needs making use of HDAStreamMap + HDAStreamChannel. */
@@ -1064 +1066 @@
         {
             /* We always increment the position of DMA buffer counter because we're always reading
-             * into an intermediate buffer. */
+             * into an intermediate DMA buffer. */
             pBDLE->State.u32BufOff += (uint32_t)cbDMA;
             Assert(pBDLE->State.u32BufOff <= pBDLE->Desc.u32BufSize);