Changeset 70737 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Jan 25, 2018 11:31:09 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

120496

Message:

DevSB16.cpp/sb16TimerIO: Fixed assertion triggering when audio output & input are disabled.

File:

• trunk/src/VBox/Devices/Audio/DevSB16.cpp (modified) (2 diffs)

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

@@ -1988 +1988 @@
             continue;
 
-#ifdef DEBUG
+#ifdef VBOX_STRICT
+        /*
+         * Sanity. Make sure that all streams have the same configuration
+         * to get SB16's DMA transfers right.
+         *
+         * SB16 only allows one output configuration per serial data out,
+         * so check if all streams have the same configuration.
+         */
         PSB16DRIVER pDrvPrev = RTListNodeGetPrev(&pDrv->Node, SB16DRIVER, Node);
         if (   pDrvPrev
@@ -1994 +2001 @@
         {
             PPDMAUDIOSTREAM pStreamPrev = pDrvPrev->Out.pStream;
-            AssertPtr(pStreamPrev);
-
-            /*
-             * Sanity. Make sure that all streams have the same configuration
-             * to get SB16's DMA transfers right.
-             *
-             * SB16 only allows one output configuration per serial data out,
-             * so check if all streams have the same configuration.
-             */
-            AssertMsg(pStream->Cfg.Props.uHz       == pStreamPrev->Cfg.Props.uHz,
-                      ("%RU32Hz vs. %RU32Hz\n", pStream->Cfg.Props.uHz, pStreamPrev->Cfg.Props.uHz));
-            AssertMsg(pStream->Cfg.Props.cChannels == pStreamPrev->Cfg.Props.cChannels,
-                      ("%RU8 vs. %RU8 channels\n", pStream->Cfg.Props.cChannels, pStreamPrev->Cfg.Props.cChannels));
-            AssertMsg(pStream->Cfg.Props.cBits     == pStreamPrev->Cfg.Props.cBits,
-                      ("%d vs. %d bits\n", pStream->Cfg.Props.cBits, pStreamPrev->Cfg.Props.cBits));
-            AssertMsg(pStream->Cfg.Props.fSigned   == pStreamPrev->Cfg.Props.fSigned,
-                      ("%RTbool vs. %RTbool signed\n", pStream->Cfg.Props.fSigned, pStreamPrev->Cfg.Props.fSigned));
+            if (pStreamPrev)
+            {
+                AssertMsg(pStream->Cfg.Props.uHz       == pStreamPrev->Cfg.Props.uHz,
+                          ("%RU32Hz vs. %RU32Hz\n", pStream->Cfg.Props.uHz, pStreamPrev->Cfg.Props.uHz));
+                AssertMsg(pStream->Cfg.Props.cChannels == pStreamPrev->Cfg.Props.cChannels,
+                          ("%RU8 vs. %RU8 channels\n", pStream->Cfg.Props.cChannels, pStreamPrev->Cfg.Props.cChannels));
+                AssertMsg(pStream->Cfg.Props.cBits     == pStreamPrev->Cfg.Props.cBits,
+                          ("%d vs. %d bits\n", pStream->Cfg.Props.cBits, pStreamPrev->Cfg.Props.cBits));
+                AssertMsg(pStream->Cfg.Props.fSigned   == pStreamPrev->Cfg.Props.fSigned,
+                          ("%RTbool vs. %RTbool signed\n", pStream->Cfg.Props.fSigned, pStreamPrev->Cfg.Props.fSigned));
+            }
         }
 #endif