Changeset 76686 in vbox for trunk

Timestamp:

Jan 7, 2019 4:45:48 PM (6 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio: Added drvAudioStreamDropInternal() to distinguish from drvAudioStreamReset() better.

File:

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

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

@@ -55 +55 @@
 static int drvAudioStreamIterateInternal(PDRVAUDIO pThis, PPDMAUDIOSTREAM pStream);
 static int drvAudioStreamReInitInternal(PDRVAUDIO pThis, PPDMAUDIOSTREAM pStream);
+static void drvAudioStreamDropInternal(PDRVAUDIO pThis, PPDMAUDIOSTREAM pStream);
 static void drvAudioStreamResetInternal(PDRVAUDIO pThis, PPDMAUDIOSTREAM pStream);
 
@@ -376 +377 @@
                     rc = drvAudioStreamControlInternalBackend(pThis, pStream, PDMAUDIOSTREAMCMD_DISABLE);
                     if (RT_SUCCESS(rc))
-                        pStream->fStatus &= ~PDMAUDIOSTREAMSTS_FLAG_ENABLED;
+                        drvAudioStreamResetInternal(pThis, pStream);
                 }
             }
@@ -409 +410 @@
             if (RT_SUCCESS(rc))
             {
-                drvAudioStreamResetInternal(pThis, pStream);
+                drvAudioStreamDropInternal(pThis, pStream);
             }
             break;
@@ -464 +465 @@
         {
             if (pStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_ENABLED)
-            {
                 rc = pThis->pHostDrvAudio->pfnStreamControl(pThis->pHostDrvAudio, pStream->pvBackend, PDMAUDIOSTREAMCMD_DISABLE);
-                if (RT_SUCCESS(rc))
-                    AudioMixBufReset(&pStream->Host.MixBuf);
-            }
             break;
         }
@@ -812 +809 @@
     }
 
-    /* Do the internal reset. */
-    drvAudioStreamResetInternal(pThis, pStream);
+    /* Drop all old data. */
+    drvAudioStreamDropInternal(pThis, pStream);
 
     /*
@@ -828 +825 @@
 }
 
-static void drvAudioStreamResetInternal(PDRVAUDIO pThis, PPDMAUDIOSTREAM pStream)
+/**
+ * Drops all audio data (and associated state) of a stream.
+ *
+ * @param   pThis               Pointer to driver instance.
+ * @param   pStream             Stream to drop data for.
+ */
+static void drvAudioStreamDropInternal(PDRVAUDIO pThis, PPDMAUDIOSTREAM pStream)
 {
     RT_NOREF(pThis);
+
+    LogFunc(("[%s]\n", pStream->szName));
 
     AudioMixBufReset(&pStream->Guest.MixBuf);
     AudioMixBufReset(&pStream->Host.MixBuf);
+
+    pStream->tsLastIteratedNs       = 0;
+    pStream->tsLastPlayedCapturedNs = 0;
+    pStream->tsLastReadWrittenNs    = 0;
+
+    pStream->fThresholdReached = false;
+}
+
+/**
+ * Resets a given audio stream.
+ *
+ * @param   pThis               Pointer to driver instance.
+ * @param   pStream             Stream to reset.
+ */
+static void drvAudioStreamResetInternal(PDRVAUDIO pThis, PPDMAUDIOSTREAM pStream)
+{
+    drvAudioStreamDropInternal(pThis, pStream);
+
+    LogFunc(("[%s]\n", pStream->szName));
+
+    pStream->fStatus = PDMAUDIOSTREAMSTS_FLAG_INITIALIZED;
 
 #ifdef VBOX_WITH_STATISTICS
@@ -1168 +1194 @@
                     {
                         pStream->fStatus &= ~(PDMAUDIOSTREAMSTS_FLAG_ENABLED | PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE);
+                        drvAudioStreamDropInternal(pThis, pStream);
                     }
                     else