Changeset 87854 in vbox

Timestamp:

Feb 23, 2021 5:49:17 PM (4 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio: Streamline drvAudioStreamGetReadable() a bit more.

File:

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

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

@@ -2955 +2955 @@
              * Reading the actual data from a stream then will return silence then.
              */
-            if (  !DrvAudioHlpStreamStatusCanRead(
-                      pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pStream->pvBackend)
-                || fDisabled))
+            PDMAUDIOSTREAMSTS fStatus = PDMAUDIOSTREAMSTS_FLAGS_NONE;
+            if (pThis->pHostDrvAudio->pfnStreamGetStatus)
+                fStatus = pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pStream->pvBackend);
+            if (   !DrvAudioHlpStreamStatusCanRead(fStatus)
+                || fDisabled)
             {
                 cbReadable = DrvAudioHlpNanoToBytes(RTTimeNanoTS() - pStream->tsLastReadWrittenNs,
@@ -2963 +2965 @@
                 if (!(pStream->fWarningsShown & PDMAUDIOSTREAM_WARN_FLAGS_DISABLED))
                 {
-                    LogRel(("Audio: Stream '%s' not ready or driver has disabled audio input, returning silence\n", pStream->szName));
+                    LogRel(("Audio: Warning: Stream '%s' not ready or driver has disabled audio input (stream status is %#x, VM input status is %s), returning silence\n",
+                            pStream->szName, fStatus, fDisabled ? "disabled" : "enabled"));
                     pStream->fWarningsShown |= PDMAUDIOSTREAM_WARN_FLAGS_DISABLED;
                 }
@@ -2970 +2973 @@
 
         /* Make sure to align the readable size to the guest's frame size. */
-        cbReadable = DrvAudioHlpBytesAlign(cbReadable, &pStream->Guest.Cfg.Props);
+        if (cbReadable)
+            cbReadable = DrvAudioHlpBytesAlign(cbReadable, &pStream->Guest.Cfg.Props);
     }