Changeset 78506 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

May 14, 2019 2:28:16 PM (6 years ago)

Author:

vboxsync

Message:

Audio: Try to fix a hang w/ VRDE audio driver enabled.

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixer.cpp (modified) (3 diffs)
• DevIchAc97.cpp (modified) (2 diffs)
• HDAStream.cpp (modified) (2 diffs)

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

@@ -779 +779 @@
 
         default:
-            rc = VERR_NOT_IMPLEMENTED;
+            AssertFailedStmt(rc = VERR_NOT_IMPLEMENTED);
             break;
     }
 
-#ifdef LOG_ENABLED
     char *pszStatus = dbgAudioMixerSinkStatusToStr(pSink->fStatus);
-    LogFlowFunc(("[%s] enmCmd=%d, fStatus=%s, rc=%Rrc\n", pSink->pszName, enmSinkCmd, pszStatus, rc));
+    LogRel2(("Mixer: Set new status of sink '%s' to %s\n", pSink->pszName, pszStatus));
+    LogFlowFunc(("[%s] enmCmd=%RU32, fStatus=%s, rc=%Rrc\n", pSink->pszName, enmSinkCmd, pszStatus, rc));
     RTStrFree(pszStatus);
-#endif
 
     int rc2 = RTCritSectLeave(&pSink->CritSect);
@@ -2012 +2011 @@
               ("%s: Can't write to a sink which is not an output sink\n", pSink->pszName));
 
-    Assert(cbBuf <= AudioMixBufFreeBytes(&pSink->MixBuf));
-
     uint32_t cbWritten = 0;
-    uint32_t cbToWrite = cbBuf;
+    uint32_t cbToWrite = RT_MIN(AudioMixBufFreeBytes(&pSink->MixBuf), cbBuf);
     while (cbToWrite)
     {
@@ -2032 +2029 @@
     }
 
-    Assert(cbWritten == cbBuf);
+    Log3Func(("[%s] cbBuf=%RU32 -> cbWritten=%RU32\n", pSink->pszName, cbBuf, cbWritten));
 
     /* Update the sink's last written time stamp. */

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

@@ -1215 +1215 @@
         RTCircBufReleaseReadBlock(pCircBuf, cbWritten);
 
-        if (RT_FAILURE(rc))
+        if (   !cbWritten /* Nothing written? */
+            || RT_FAILURE(rc))
             break;
 
@@ -1550 +1551 @@
             {
                 /* Read (guest output) data and write it to the stream's sink. */
-                rc2 = ichac97R3StreamRead(pThis, pStream, pSink, cbToReadFromStream, NULL);
+                rc2 = ichac97R3StreamRead(pThis, pStream, pSink, cbToReadFromStream, NULL /* pcbRead */);
                 AssertRC(rc2);
             }

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

@@ -873 +873 @@
         RTCircBufReleaseReadBlock(pCircBuf, cbWritten);
 
-        if (RT_FAILURE(rc))
+        if (   !cbWritten /* Nothing written? */
+            || RT_FAILURE(rc))
             break;
 
@@ -1483 +1484 @@
             {
                 /* Read (guest output) data and write it to the stream's sink. */
-                rc2 = hdaR3StreamRead(pStream, cbToReadFromStream, NULL);
+                rc2 = hdaR3StreamRead(pStream, cbToReadFromStream, NULL /* pcbRead */);
                 AssertRC(rc2);
             }