Changeset 88731 in vbox for trunk/src/VBox

Timestamp:

Apr 27, 2021 12:10:00 PM (4 years ago)

Author:

vboxsync

Message:

Audio: Fixed and tightened audio stream state assertions. Doc updates. bugref:9890

File:

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

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

@@ -1084 +1084 @@
 
     pStreamEx->Core.fStatus |= PDMAUDIOSTREAM_STS_INITIALIZED;
+    PDMAUDIOSTREAM_STS_ASSERT_VALID(pStreamEx->Core.fStatus);
 
     return VINF_SUCCESS;
@@ -1497 +1498 @@
 
         pStreamEx->Core.fStatus &= ~PDMAUDIOSTREAM_STS_INITIALIZED;
+        PDMAUDIOSTREAM_STS_ASSERT_VALID(pStreamEx->Core.fStatus);
     }
 
@@ -1750 +1752 @@
                 /* Remove the pending re-init flag on success. */
                 pStreamEx->Core.fStatus &= ~PDMAUDIOSTREAM_STS_NEED_REINIT;
+                PDMAUDIOSTREAM_STS_ASSERT_VALID(pStreamEx->Core.fStatus);
             }
             else
@@ -1767 +1770 @@
 
                 /* Don't try to re-initialize anymore and mark as disabled. */
+                /** @todo should mark it as not-initialized too, shouldn't we?   */
                 pStreamEx->Core.fStatus &= ~(PDMAUDIOSTREAM_STS_NEED_REINIT | PDMAUDIOSTREAM_STS_ENABLED);
+                PDMAUDIOSTREAM_STS_ASSERT_VALID(pStreamEx->Core.fStatus);
 
                 /* Note: Further writes to this stream go to / will be read from the bit bucket (/dev/null) from now on. */
@@ -1965 +1970 @@
 
                 if (RT_SUCCESS(rc))
+                {
                     pStreamEx->Core.fStatus |= PDMAUDIOSTREAM_STS_ENABLED;
+                    PDMAUDIOSTREAM_STS_ASSERT_VALID(pStreamEx->Core.fStatus);
+                }
             }
             break;
@@ -1983 +1991 @@
                     LogFunc(("[%s] Pending disable/pause\n", pStreamEx->Core.szName));
                     pStreamEx->Core.fStatus |= PDMAUDIOSTREAM_STS_PENDING_DISABLE;
+                    PDMAUDIOSTREAM_STS_ASSERT_VALID(pStreamEx->Core.fStatus);
 
                     /* Schedule a follow up timer to the pending-disable state.  We cannot rely
@@ -2014 +2023 @@
                 rc = drvAudioStreamControlInternalBackend(pThis, pStreamEx, PDMAUDIOSTREAMCMD_PAUSE);
                 if (RT_SUCCESS(rc))
+                {
                     pStreamEx->Core.fStatus |= PDMAUDIOSTREAM_STS_PAUSED;
+                    PDMAUDIOSTREAM_STS_ASSERT_VALID(pStreamEx->Core.fStatus);
+                }
             }
             break;
@@ -2025 +2037 @@
                 rc = drvAudioStreamControlInternalBackend(pThis, pStreamEx, PDMAUDIOSTREAMCMD_RESUME);
                 if (RT_SUCCESS(rc))
+                {
                     pStreamEx->Core.fStatus &= ~PDMAUDIOSTREAM_STS_PAUSED;
+                    PDMAUDIOSTREAM_STS_ASSERT_VALID(pStreamEx->Core.fStatus);
+                }
             }
             break;
@@ -2351 +2366 @@
                     {
                         pStreamEx->Core.fStatus &= ~(PDMAUDIOSTREAM_STS_ENABLED | PDMAUDIOSTREAM_STS_PENDING_DISABLE);
+                        PDMAUDIOSTREAM_STS_ASSERT_VALID(pStreamEx->Core.fStatus);
                         drvAudioStreamDropInternal(pThis, pStreamEx); /* Not a DROP command, just a stream reset. */
                     }
@@ -3047 +3063 @@
     {
         pStreamEx->Core.fStatus |= PDMAUDIOSTREAM_STS_NEED_REINIT;
+        PDMAUDIOSTREAM_STS_ASSERT_VALID(pStreamEx->Core.fStatus);
         pStreamEx->cTriesReInit  = 0;
         pStreamEx->nsLastReInit  = 0;