Changeset 67505 in vbox

Timestamp:

Jun 20, 2017 1:31:15 PM (8 years ago)

Author:

vboxsync

Message:

Audio/DevHDA.cpp: Fixes for hdaStreamUpdate().

File:

• trunk/src/VBox/Devices/Audio/DevHDA.cpp (modified) (1 diff)

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

@@ -5481 +5481 @@
     if (hdaGetDirFromSD(pStream->u8SD) == PDMAUDIODIR_OUT) /* Output (SDO). */
     {
-        /* Is the sink ready to be written (guest output data) to? If so, by how much? */
-        const uint32_t cbWritable = AudioMixerSinkGetWritable(pSink);
+        /* Is the HDA stream ready to be written (guest output data) to? If so, by how much? */
+        const uint32_t cbFree = hdaStreamGetFree(pStream);
 
         if (   fInTimer
-            && cbWritable)
-        {
-            Log3Func(("[SD%RU8] cbWritable=%RU32\n", pStream->u8SD, cbWritable));
-
-            /* When running synchronously, do the DMA data transfers here.
-             * Otherwise this will be done in the device timer. */
-            rc2 = hdaStreamTransfer(pThis, pStream, cbWritable);
+            && cbFree)
+        {
+            Log3Func(("[SD%RU8] cbFree=%RU32\n", pStream->u8SD, cbFree));
+
+            /* Do the DMA transfer. */
+            rc2 = hdaStreamTransfer(pThis, pStream, cbFree);
             AssertRC(rc2);
+        }
+
+        /* How much (guest output) data is available at the moment for the HDA stream? */
+        uint32_t cbUsed = hdaStreamGetUsed(pStream);
 
 #ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO
+        if (   fInTimer
+            && cbUsed)
+        {
             rc2 = hdaStreamAsyncIONotify(pThis, pStream);
             AssertRC(rc2);
-#endif
-        }
-
-#ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO
-        if (!fInTimer)
-        {
-#endif
-            /* How much (guest output) data is available at the moment? */
-            uint32_t cbAvailable = hdaStreamGetUsed(pStream);
+        }
+        else
+        {
+#endif
+            const uint32_t cbSinkWritable = AudioMixerSinkGetWritable(pSink);
 
             /* Do not write more than the sink can hold at the moment.
              * The host sets the overall pace. */
-            if (cbAvailable > cbWritable)
-                cbAvailable = cbWritable;
-
-            if (cbAvailable)
+            if (cbUsed > cbSinkWritable)
+                cbUsed = cbSinkWritable;
+
+            if (cbUsed)
             {
                 /* Read (guest output) data and write it to the stream's sink. */
-                rc2 = hdaStreamRead(pThis, pStream, cbAvailable, NULL /* pcbRead */);
+                rc2 = hdaStreamRead(pThis, pStream, cbUsed, NULL /* pcbRead */);
                 AssertRC(rc2);
             }