Changeset 87849 in vbox

Timestamp:

Feb 23, 2021 1:27:42 PM (4 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio: Made a debug warning show up in LogRel() when a certain audio backend is not ready to operate. Added warning flags to the stream's state to avoid log flooding.

Location:

trunk

Files:

• include/VBox/vmm/pdmaudioifs.h (modified) (2 diffs)
• src/VBox/Devices/Audio/DrvAudio.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -1201 +1201 @@
 typedef struct PDMAUDIOSTREAM *PPDMAUDIOSTREAMCTX;
 
+/** No stream warning flags set. */
+#define PDMAUDIOSTREAM_WARN_FLAGS_NONE          0
+/** Warned about a disabled stream. */
+#define PDMAUDIOSTREAM_WARN_FLAGS_DISABLED      RT_BIT(0)
+
 /**
  * An input or output audio stream.
@@ -1215 +1220 @@
     /** Number of (re-)tries while re-initializing the stream. */
     uint32_t                cTriesReInit;
+    /** Warnings shown already in the release log.
+     *  See PDMAUDIOSTREAM_WARN_FLAGS_XXX defines. */
+    uint32_t                fWarningsShown;
     /** Stream status flag. */
     PDMAUDIOSTREAMSTS       fStatus;

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

@@ -896 +896 @@
     LogFunc(("[%s]\n", pStream->szName));
 
-    pStream->fStatus = PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED;
+    pStream->fStatus        = PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED;
+    pStream->fWarningsShown = PDMAUDIOSTREAM_WARN_FLAGS_NONE;
+
 #ifdef VBOX_WITH_STATISTICS
     /*
@@ -2800 +2802 @@
                             fEnable ? "enable" : "disable", enmDir == PDMAUDIODIR_IN ? "input" : "output", pStream->szName, rc2));
             }
+            else
+            {
+                /* When (re-)enabling a stream, clear the disabled warning bit again. */
+                if (fEnable)
+                    pStream->fWarningsShown &= ~PDMAUDIOSTREAM_WARN_FLAGS_DISABLED;
+            }
 
             if (RT_SUCCESS(rc))
@@ -2953 +2961 @@
                 cbReadable = DrvAudioHlpNanoToBytes(RTTimeNanoTS() - pStream->tsLastReadWrittenNs,
                                                     &pStream->Host.Cfg.Props);
-                Log3Func(("[%s] Backend stream not ready or driver has disabled audio input, returning silence\n", pStream->szName));
+                if (!(pStream->fWarningsShown & PDMAUDIOSTREAM_WARN_FLAGS_DISABLED))
+                {
+                    LogRel(("Audio: Stream '%s' not ready or driver has disabled audio input, returning silence\n", pStream->szName));
+                    pStream->fWarningsShown |= PDMAUDIOSTREAM_WARN_FLAGS_DISABLED;
+                }
             }
         }