Changeset 67827 in vbox

Timestamp:

Jul 6, 2017 2:15:02 PM (8 years ago)

Author:

vboxsync

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

116759

Message:

Audio/AudioMixer.cpp: The host sets the pace.

File:

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

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

@@ -876 +876 @@
         return 0;
 
-    uint32_t cbWritable = 0;
+    uint32_t cbWritable = UINT32_MAX;
 
     if (    (pSink->fStatus & AUDMIXSINK_STS_RUNNING)
@@ -897 +897 @@
             const uint32_t cbWritableStream = pMixStream->pConn->pfnStreamGetWritable(pMixStream->pConn, pMixStream->pStream);
 
-            if (cbWritable < cbWritableStream)
+            if (cbWritableStream < cbWritable)
                 cbWritable = cbWritableStream;
-
-            break; /** @todo For now the first stream sets the pace. */
         }
 #endif
     }
+
+    if (cbWritable == UINT32_MAX)
+        cbWritable = 0;
 
     Log3Func(("[%s] cbWritable=%RU32\n", pSink->pszName, cbWritable));
@@ -1053 +1054 @@
 int AudioMixerSinkRead(PAUDMIXSINK pSink, AUDMIXOP enmOp, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
 {
+    AssertPtrReturn(pSink, VERR_INVALID_POINTER);
     RT_NOREF(enmOp);
-    AssertPtrReturn(pSink, VERR_INVALID_POINTER);
     AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
     AssertReturn(cbBuf,    VERR_INVALID_PARAMETER);
@@ -1592 +1593 @@
 int AudioMixerSinkWrite(PAUDMIXSINK pSink, AUDMIXOP enmOp, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
 {
+    AssertPtrReturn(pSink, VERR_INVALID_POINTER);
     RT_NOREF(enmOp);
-    AssertPtrReturn(pSink, VERR_INVALID_POINTER);
+    AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
+    AssertReturn   (cbBuf, VERR_INVALID_PARAMETER);
     /* pcbWritten is optional. */
-
-    if (!pvBuf || !cbBuf)
-    {
-        if (pcbWritten)
-            *pcbWritten = 0;
-        return VINF_SUCCESS;
-    }
 
     int rc = RTCritSectEnter(&pSink->CritSect);
@@ -1614 +1610 @@
     Log3Func(("[%s] enmOp=%d, cbBuf=%RU32\n", pSink->pszName, enmOp, cbBuf));
 
-    uint32_t cbWritten = 0;
+    uint32_t cbWritten = UINT32_MAX;
 
     PAUDMIXSTREAM pMixStream;
@@ -1630 +1626 @@
             LogFunc(("[%s] Failed writing to stream '%s': %Rrc\n", pSink->pszName, pMixStream->pszName, rc2));
 
-        if (cbProcessed < cbBuf)
-            LogFunc(("[%s] Only written %RU32/%RU32 bytes for stream '%s', rc=%Rrc\n",
-                     pSink->pszName, cbProcessed, cbBuf, pMixStream->pszName, rc2));
+        Log3Func(("[%s] Written %RU32 to '%s'\n", pSink->pszName, cbProcessed, pMixStream->pszName));
 
         if (cbProcessed)
@@ -1638 +1632 @@
             /* Set dirty bit. */
             pSink->fStatus |= AUDMIXSINK_STS_DIRTY;
-        }
-
-        Log3Func(("\t%s: cbProcessed=%RU32\n", pMixStream->pszName, cbProcessed));
-
-        /*
-         * Return the maximum bytes processed by all connected streams.
-         * Streams which have processed less than the current maximum have to deal with
-         * this themselves.
-         */
-        cbWritten = RT_MAX(cbWritten, cbProcessed);
-    }
+
+            /*
+             * Return the minimum bytes processed by all connected streams.
+             * The host sets the pace, so all backends have to behave accordingly.
+             */
+            if (cbWritten > cbProcessed)
+                cbWritten = cbProcessed;
+        }
+    }
+
+    if (cbWritten == UINT32_MAX)
+        cbWritten = 0;
+
+    Log3Func(("[%s] cbWritten=%RU32\n", pSink->pszName, cbWritten));
 
     if (pcbWritten)