Changeset 63623 in vbox

Timestamp:

Aug 24, 2016 8:31:28 AM (8 years ago)

Author:

vboxsync

Message:

Audio/AudioMixer.cpp: Do not return an error in AudioMixerSinkRead() if getting input data from a specific stream failed, extended logging.

File:

• trunk/src/VBox/Devices/Audio/AudioMixer.cpp (modified) (8 diffs)

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

@@ -761 +761 @@
 #endif
 
-    Log3Func(("[%s]: cbReadable=%RU32\n", pSink->pszName, cbReadable));
+    Log3Func(("[%s] cbReadable=%RU32\n", pSink->pszName, cbReadable));
 
     int rc2 = RTCritSectLeave(&pSink->CritSect);
@@ -794 +794 @@
 #endif
 
-    Log3Func(("[%s]: cbWritable=%RU32\n", pSink->pszName, cbWritable));
+    Log3Func(("[%s] cbWritable=%RU32\n", pSink->pszName, cbWritable));
 
     int rc2 = RTCritSectLeave(&pSink->CritSect);
@@ -957 +957 @@
         if (!(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTRMSTS_FLAG_ENABLED))
         {
-            LogFlowFunc(("%s: Stream '%s' Disabled, skipping ...\n", pMixStream->pszName, pMixStream->pStream->szName));
+            Log3Func(("[%s] Stream '%s' disabled, skipping ...\n", pSink->pszName, pMixStream->pszName));
             continue;
         }
@@ -963 +963 @@
         uint32_t cbTotalRead = 0;
         uint32_t cbToRead    = cbBuf;
+
+        int rc2 = VINF_SUCCESS;
 
         while (cbToRead)
@@ -968 +970 @@
             uint32_t cbReadStrm;
             AssertPtr(pMixStream->pConn);
-#ifndef VBOX_AUDIO_MIXER_WITH_MIXBUF
-            rc = pMixStream->pConn->pfnStreamRead(pMixStream->pConn, pMixStream->pStream,
-                                                  (uint8_t *)pvMixBuf + cbTotalRead, cbToRead, &cbReadStrm);
+#ifdef VBOX_AUDIO_MIXER_WITH_MIXBUF
+# error "Implement me!"
+#else
+            rc2 = pMixStream->pConn->pfnStreamRead(pMixStream->pConn, pMixStream->pStream,
+                                                   (uint8_t *)pvMixBuf + cbTotalRead, cbToRead, &cbReadStrm);
 #endif
-            if (   RT_FAILURE(rc)
+            if (RT_FAILURE(rc2))
+                Log3Func(("[%s] Failed reading from stream '%s': %Rrc\n", pSink->pszName, pMixStream->pszName, rc2));
+
+            if (   RT_FAILURE(rc2)
                 || !cbReadStrm)
                 break;
@@ -983 +990 @@
         }
 
-        if (RT_FAILURE(rc))
+        if (RT_FAILURE(rc2))
             continue;
 
@@ -997 +1004 @@
             pSink->fStatus &= ~AUDMIXSINK_STS_DIRTY;
 
-#ifndef VBOX_AUDIO_MIXER_WITH_MIXBUF
+#ifdef VBOX_AUDIO_MIXER_WITH_MIXBUF
+# error "Implement me!"
+#else
         if (cbRead)
             memcpy(pvBuf, pvMixBuf, cbRead);
@@ -1009 +1018 @@
 #endif
 
-    Log3Func(("[%s]: cbRead=%RU32, fStatus=0x%x, rc=%Rrc\n", pSink->pszName, cbRead, pSink->fStatus, rc));
+    Log3Func(("[%s] cbRead=%RU32, fStatus=0x%x, rc=%Rrc\n", pSink->pszName, cbRead, pSink->fStatus, rc));
 
     int rc2 = RTCritSectLeave(&pSink->CritSect);