Changeset 73814 in vbox

Timestamp:

Aug 22, 2018 8:40:54 AM (6 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio: Fixes for drvAudioStreamPlay(), drvAudioStreamWrite() and drvAudioStreamGetWritable().

File:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (modified) (4 diffs)

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

@@ -871 +871 @@
               ("Stream '%s' is not an output stream and therefore cannot be written to (direction is 0x%x)\n",
                pStream->szName, pStream->enmDir));
-
-    AssertMsg(DrvAudioHlpBytesIsAligned(cbBuf, &pStream->Guest.Cfg.Props),
-              ("Writing audio data (%RU32 bytes) to stream '%s' is not properly aligned\n", cbBuf, pStream->szName));
 
     uint32_t cbWrittenTotal = 0;
@@ -1455 +1452 @@
         if (fDoPlay)
         {
-            uint32_t cfWritable;
-            if (pThis->pHostDrvAudio->pfnStreamGetWritable)
-            {
-                cfWritable = PDMAUDIOPCMPROPS_B2F(&pStream->Host.Cfg.Props,
-                                                  pThis->pHostDrvAudio->pfnStreamGetWritable(pThis->pHostDrvAudio, pStream->pvBackend));
-            }
-            else
-                cfWritable = cfPeriod;
+            uint32_t cfWritable = PDMAUDIOPCMPROPS_B2F(&pStream->Host.Cfg.Props,
+                                                       pThis->pHostDrvAudio->pfnStreamGetWritable(pThis->pHostDrvAudio, pStream->pvBackend));
 
             uint32_t cfToPlay = 0;
@@ -1469 +1460 @@
 
             if (!cfToPlay)
-                cfToPlay = cfWritable;
+            {
+                /* Did we reach/pass (in real time) the device scheduling slot?
+                 * Play as much as we can write to the backend then. */
+                if (cfPassedReal >= DrvAudioHlpMilliToFrames(pStream->Guest.Cfg.Device.uSchedulingHintMs, &pStream->Host.Cfg.Props))
+                    cfToPlay = cfWritable;
+            }
 
             if (cfToPlay > cfLive) /* Don't try to play more than available. */
@@ -2800 +2796 @@
         cbWritable = AudioMixBufFreeBytes(&pStream->Host.MixBuf);
 
-        /* Make sure to align the writable size to the guest's frame size. */
-        cbWritable = DrvAudioHlpBytesAlign(cbWritable, &pStream->Guest.Cfg.Props);
+        /* Make sure to align the writable size to the host's frame size. */
+        cbWritable = DrvAudioHlpBytesAlign(cbWritable, &pStream->Host.Cfg.Props);
     }