Changeset 64050 in vbox

Timestamp:

Sep 27, 2016 2:41:59 PM (9 years ago)

Author:

vboxsync

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

110977

Message:

Audio/DrvAudio.cpp: A bit of cleanup in drvAudioStreamControlInternal(), logging tweaks.

File:

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

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

@@ -329 +329 @@
                 }
 
-                pGstStream->fStatus |= PDMAUDIOSTRMSTS_FLAG_ENABLED;
+                if (RT_SUCCESS(rc))
+                    pGstStream->fStatus |= PDMAUDIOSTRMSTS_FLAG_ENABLED;
             }
             break;
@@ -335 +336 @@
 
         case PDMAUDIOSTREAMCMD_DISABLE:
-        case PDMAUDIOSTREAMCMD_PAUSE:
         {
             if (pGstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED)
             {
-                /* Is the guest side stream still active?
-                 * Mark the host stream as pending disable and bail out. */
                 if (pHstStream)
                 {
-                    LogFunc(("[%s] Pending disable/pause\n", pHstStream->szName));
-                    pHstStream->fStatus |= PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE;
+                    /*
+                     * For playback (output) streams first mark the host stream as pending disable,
+                     * so that the rest of the remaining audio data will be played first before
+                     * closing the stream.
+                     */
+                    if (pHstStream->enmDir == PDMAUDIODIR_OUT)
+                    {
+                        LogFunc(("[%s] Pending disable/pause\n", pHstStream->szName));
+                        pHstStream->fStatus |= PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE;
+                    }
+
+                    /* Can we close the host stream as well (not in pending disable mode)? */
+                    if (!(pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE))
+                        rc = drvAudioStreamControlInternalBackend(pThis, pHstStream, PDMAUDIOSTREAMCMD_DISABLE);
                 }
 
-                if (enmStreamCmd == PDMAUDIOSTREAMCMD_DISABLE)
-                {
+                if (RT_SUCCESS(rc))
                     pGstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_ENABLED;
-                }
-                else if (enmStreamCmd == PDMAUDIOSTREAMCMD_PAUSE)
+            }
+            break;
+        }
+
+        case PDMAUDIOSTREAMCMD_PAUSE:
+        {
+            if (!(pGstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PAUSED))
+            {
+                if (pHstStream)
+                    rc = drvAudioStreamControlInternalBackend(pThis, pHstStream, PDMAUDIOSTREAMCMD_PAUSE);
+
+                if (RT_SUCCESS(rc))
                     pGstStream->fStatus |= PDMAUDIOSTRMSTS_FLAG_PAUSED;
-                else
-                    AssertFailedBreakStmt(rc = VERR_NOT_IMPLEMENTED);
-            }
-
-            if (   pHstStream
-                && !(pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE))
-            {
-                rc = drvAudioStreamControlInternalBackend(pThis, pHstStream, enmStreamCmd);
-                if (RT_SUCCESS(rc))
-                    pHstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE;
             }
             break;
@@ -374 +383 @@
                     rc = drvAudioStreamControlInternalBackend(pThis, pHstStream, PDMAUDIOSTREAMCMD_RESUME);
 
-                pGstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_PAUSED;
+                if (RT_SUCCESS(rc))
+                    pGstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_PAUSED;
             }
             break;
@@ -900 +910 @@
  * @param   pThis               Pointer to driver instance.
  * @param   pStream             Stream to iterate.
- *
- * @remark
  */
 static int drvAudioStreamIterateInternal(PDRVAUDIO pThis, PPDMAUDIOSTREAM pStream)
@@ -912 +920 @@
     PPDMAUDIOSTREAM pHstStream = drvAudioGetHostStream(pStream);
     AssertPtr(pHstStream);
-    PPDMAUDIOSTREAM pGstStream = pHstStream->pPair;
+    PPDMAUDIOSTREAM pGstStream = pHstStream ? pHstStream->pPair : NULL;
     AssertPtr(pGstStream);
 
@@ -937 +945 @@
     }
 
+    Log3Func(("[%s] fStatus=0x%x\n", pHstStream->szName, pHstStream->fStatus));
+
+    /* Not enabled or paused? Skip iteration. */
+    if (   !(pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED)
+        ||  (pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PAUSED))
+    {
+        return VINF_SUCCESS;
+    }
+
     /* Whether to try closing a pending to close stream. */
     bool fTryClosePending = false;
@@ -952 +969 @@
             /* Has the host captured any samples which were not mixed to the guest side yet? */
             uint32_t cSamplesCaptured = AudioMixBufUsed(&pHstStream->MixBuf);
-
-            Log3Func(("[%s] %RU32 samples captured\n", pHstStream->szName, cSamplesCaptured));
-
             if (cSamplesCaptured)
             {
@@ -960 +974 @@
                  * So try mixing not yet mixed host-side samples to the guest-side buffer. */
                 rc = AudioMixBufMixToParent(&pHstStream->MixBuf, cSamplesCaptured, &cSamplesMixed);
-                if (   RT_SUCCESS(rc)
-                    && cSamplesMixed)
-                {
-                    Log3Func(("[%s] %RU32 captured samples mixed\n", pHstStream->szName, cSamplesMixed));
-                }
-                else if (RT_FAILURE(rc))
+                if (RT_FAILURE(rc))
                 {
                     if (rc == VERR_BUFFER_OVERFLOW)
@@ -972 +981 @@
                         LogRel2(("Audio: Mixing to guest input stream '%s' failed: %Rrc\n", pGstStream->szName, rc));
                 }
+
+                Log3Func(("[%s] %RU32/%RU32 input samples mixed, rc=%Rrc\n", pHstStream->szName, cSamplesMixed, cSamplesCaptured, rc));
             }
             else
@@ -986 +997 @@
                 && cSamplesMixed)
             {
-                Log3Func(("[%s] %RU32 samples mixed, guest has %RU32 samples left (%RU32 live)\n",
+                Log3Func(("[%s] %RU32 output samples mixed, guest has %RU32 samples left (%RU32 live)\n",
                           pHstStream->szName, cSamplesMixed,
                           AudioMixBufUsed(&pGstStream->MixBuf), AudioMixBufLive(&pGstStream->MixBuf)));
@@ -1020 +1031 @@
                 }
                 else
-                    LogFunc(("%s: Backend vetoed against closing output stream, rc=%Rrc\n", pHstStream->szName, rc));
+                    LogFunc(("[%s] Backend vetoed against closing pending output stream, rc=%Rrc\n", pHstStream->szName, rc));
             }
         }
@@ -1031 +1042 @@
 
     if (RT_FAILURE(rc))
-        LogFunc(("Failed with %Rrc\n", rc));
+        LogFunc(("[%s] Failed with %Rrc\n",  pHstStream->szName, rc));
 
     return rc;
@@ -1193 +1204 @@
                pStream->szName, pStream->enmDir));
 
-    Log3Func(("[%s]\n", pStream->szName));
-
     uint32_t cSamplesCaptured = 0;
 
@@ -1232 +1241 @@
                 {
 #ifdef VBOX_WITH_STATISTICS
+                    STAM_COUNTER_ADD(&pThis->Stats.TotalSamplesCaptured,  cSamplesCaptured);
                     STAM_COUNTER_ADD(&pHstStream->In.StatSamplesCaptured, cSamplesCaptured);
 #endif
                 }
             }
-
-            Log3Func(("[%s] strmSts=0x%x, cSamplesCaptured=%RU32, rc=%Rrc\n", pHstStream->szName, stsBackend, cSamplesCaptured, rc));
-        }
+        }
+
+        Log3Func(("[%s] stsBackend=0x%x, cSamplesLive=%RU32, cSamplesCaptured=%RU32, rc=%Rrc\n",
+                  pHstStream->szName, stsBackend, cSamplesLive, cSamplesCaptured, rc));
 
     } while (0);
@@ -1649 +1660 @@
     AssertPtrReturn(pThis, VERR_INVALID_POINTER);
 
-    if (!pStream)
-    {
-        if (pcbRead)
-            *pcbRead = 0;
-        return VINF_SUCCESS;
-    }
-
-    AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
-    AssertReturn(cbBuf,    VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pStream, VERR_INVALID_POINTER);
+    AssertPtrReturn(pvBuf,   VERR_INVALID_POINTER);
+    AssertReturn(cbBuf,      VERR_INVALID_PARAMETER);
     /* pcbWritten is optional. */
 
@@ -1688 +1693 @@
 
         PPDMAUDIOSTREAM pGstStream = pHstStream->pPair;
-
-        AssertMsg(pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED,
-                  ("Reading from disabled host input stream '%s' not possible\n", pHstStream->szName));
+        AssertPtr(pGstStream);
 
         pGstStream->In.tsLastReadMS = RTTimeMilliTS();
-
-        Log3Func(("%s\n", pStream->szName));
 
         /*
@@ -1716 +1717 @@
         }
 
-        Log3Func(("cRead=%RU32 (%RU32 bytes), rc=%Rrc\n", cRead, AUDIOMIXBUF_S2B(&pGstStream->MixBuf, cRead), rc));
-
     } while (0);
+
+    Log3Func(("[%s] cbRead=%RU32, rc=%Rrc\n", pStream->szName, cbRead, rc));
 
     int rc2 = RTCritSectLeave(&pThis->CritSect);
@@ -2515 +2516 @@
 #ifdef VBOX_WITH_STATISTICS
         PDMDrvHlpSTAMRegCounterEx(pDrvIns, &pThis->Stats.TotalStreamsActive,   "TotalStreamsActive",
-                                  STAMUNIT_COUNT, "Active input streams.");
+                                  STAMUNIT_COUNT, "Total active audio streams.");
         PDMDrvHlpSTAMRegCounterEx(pDrvIns, &pThis->Stats.TotalStreamsCreated,  "TotalStreamsCreated",
-                                  STAMUNIT_COUNT, "Total created input streams.");
+                                  STAMUNIT_COUNT, "Total created audio streams.");
         PDMDrvHlpSTAMRegCounterEx(pDrvIns, &pThis->Stats.TotalSamplesPlayed,   "TotalSamplesPlayed",
                                   STAMUNIT_COUNT, "Total samples played.");