Changeset 63848 in vbox for trunk

Timestamp:

Sep 15, 2016 9:50:13 AM (8 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio.cpp: Logging, renaming.

File:

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

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

@@ -965 +965 @@
                     Log3Func(("[%s] %RU32 captured samples mixed\n", pHstStream->szName, cSamplesMixed));
                 }
+                else if (RT_FAILURE(rc))
+                {
+                    if (rc == VERR_BUFFER_OVERFLOW)
+                        LogRel2(("Audio: Guest input stream '%s' full, expect stuttering audio capture\n", pGstStream->szName));
+                    else
+                        LogRel2(("Audio: Mixing to guest input stream '%s' failed: %Rrc\n", pGstStream->szName, rc));
+                }
             }
             else
@@ -982 +989 @@
                           pHstStream->szName, cSamplesMixed,
                           AudioMixBufUsed(&pGstStream->MixBuf), AudioMixBufLive(&pGstStream->MixBuf)));
+            }
+            else if (RT_FAILURE(rc))
+            {
+                if (rc == VERR_BUFFER_OVERFLOW)
+                    LogRel2(("Audio: Host output stream '%s' full, expect stuttering audio output\n", pHstStream->szName));
+                else
+                    LogRel2(("Audio: Mixing to host output stream '%s' failed: %Rrc\n", pHstStream->szName, rc));
             }
 
@@ -1101 +1115 @@
 
         AssertPtr(pThis->pHostDrvAudio->pfnStreamGetStatus);
-        PDMAUDIOSTRMSTS strmSts = pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pHstStream);
+        PDMAUDIOSTRMSTS stsBackend = pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pHstStream);
 
         uint32_t cSamplesLive = AudioMixBufLive(&pGstStream->MixBuf);
         if (cSamplesLive)
         {
-            if (   (strmSts & PDMAUDIOSTRMSTS_FLAG_INITIALIZED)
-                && (strmSts & PDMAUDIOSTRMSTS_FLAG_DATA_WRITABLE))
+            if (   (stsBackend & PDMAUDIOSTRMSTS_FLAG_ENABLED)
+                && (stsBackend & PDMAUDIOSTRMSTS_FLAG_DATA_WRITABLE))
             {
                 AssertPtr(pThis->pHostDrvAudio->pfnStreamPlay);
@@ -1200 +1214 @@
 
         AssertPtr(pThis->pHostDrvAudio->pfnStreamGetStatus);
-        PDMAUDIOSTRMSTS strmSts = pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pHstStream);
+        PDMAUDIOSTRMSTS stsBackend = pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pHstStream);
 
         uint32_t cSamplesLive = AudioMixBufLive(&pGstStream->MixBuf);
         if (!cSamplesLive)
         {
-            if (   (strmSts & PDMAUDIOSTRMSTS_FLAG_INITIALIZED)
-                && (strmSts & PDMAUDIOSTRMSTS_FLAG_DATA_READABLE))
+            if (   (stsBackend & PDMAUDIOSTRMSTS_FLAG_ENABLED)
+                && (stsBackend & PDMAUDIOSTRMSTS_FLAG_DATA_READABLE))
             {
                 rc = pThis->pHostDrvAudio->pfnStreamCapture(pThis->pHostDrvAudio, pHstStream, NULL /* pvBuf */, 0 /* cbBuf */,
@@ -1223 +1237 @@
             }
 
-            Log3Func(("[%s] strmSts=0x%x, cSamplesCaptured=%RU32, rc=%Rrc\n", pHstStream->szName, strmSts, cSamplesCaptured, rc));
+            Log3Func(("[%s] strmSts=0x%x, cSamplesCaptured=%RU32, rc=%Rrc\n", pHstStream->szName, stsBackend, cSamplesCaptured, rc));
         }
 
@@ -2106 +2120 @@
     {
         strmSts = pHstStream->fStatus;
-        Log3Func(("%s: strmSts=0x%x\n", pHstStream->szName, strmSts));
+        Log3Func(("[%s] strmSts=0x%x\n", pHstStream->szName, strmSts));
     }