Changeset 73645 in vbox for trunk

Timestamp:

Aug 14, 2018 11:22:28 AM (6 years ago)

Author:

vboxsync

Message:

Audio/Mixer: Cleanup / renaming for audioMixerSinkWriteToStreams().

File:

• trunk/src/VBox/Devices/Audio/AudioMixer.cpp (modified) (1 diff)

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

@@ -1709 +1709 @@
         size_t cbChunk;
 
-        uint32_t cbWritten = 0;
-        uint32_t cbToWrite = RT_MIN(cbBuf, (uint32_t)RTCircBufFree(pCircBuf));
-        while (cbToWrite)
-        {
-            RTCircBufAcquireWriteBlock(pCircBuf, cbToWrite, &pvChunk, &cbChunk);
+        uint32_t cbWrittenBuf = 0;
+        uint32_t cbToWriteBuf = RT_MIN(cbBuf, (uint32_t)RTCircBufFree(pCircBuf));
+        while (cbToWriteBuf)
+        {
+            RTCircBufAcquireWriteBlock(pCircBuf, cbToWriteBuf, &pvChunk, &cbChunk);
 
             if (cbChunk)
-                memcpy(pvChunk, (uint8_t *)pvBuf + cbWritten, cbChunk);
+                memcpy(pvChunk, (uint8_t *)pvBuf + cbWrittenBuf, cbChunk);
 
             RTCircBufReleaseWriteBlock(pCircBuf, cbChunk);
 
-            cbWritten += (uint32_t)cbChunk;
-            Assert(cbWritten <= cbBuf);
-
-            Assert(cbToWrite >= cbChunk);
-            cbToWrite -= (uint32_t)cbChunk;
-        }
-
-        if (cbWritten < cbBuf)
+            cbWrittenBuf += (uint32_t)cbChunk;
+            Assert(cbWrittenBuf <= cbBuf);
+
+            Assert(cbToWriteBuf >= cbChunk);
+            cbToWriteBuf -= (uint32_t)cbChunk;
+        }
+
+        cbWrittenMin = RT_MIN(cbWrittenMin, cbWrittenBuf);
+
+        if (cbWrittenBuf) /* Update the mixer stream's last written time stamp. */
+            pMixStream->tsLastReadWrittenNs = RTTimeNanoTS();
+
+        uint32_t cbToWriteStream = DrvAudioHlpBytesAlign(cbWrittenBuf, &pSink->PCMProps);
+        uint32_t cbWrittenStream = 0;
+
+        int rc2 = VINF_SUCCESS;
+
+        while (cbToWriteStream)
+        {
+            RTCircBufAcquireReadBlock(pCircBuf, cbToWriteStream, &pvChunk, &cbChunk);
+
+            uint32_t cbChunkWritten = 0;
+            if (cbChunk)
+            {
+                rc2 = pMixStream->pConn->pfnStreamWrite(pMixStream->pConn, pMixStream->pStream, pvChunk, (uint32_t)cbChunk,
+                                                        &cbChunkWritten);
+                if (RT_FAILURE(rc2))
+                    LogFunc(("[%s] Failed writing to stream '%s': %Rrc\n", pSink->pszName, pMixStream->pszName, rc2));
+#ifdef DEBUG_andy
+                AssertRC(rc2);
+#endif
+            }
+
+            RTCircBufReleaseReadBlock(pCircBuf, cbChunkWritten);
+
+            if (RT_FAILURE(rc2))
+                break;
+
+            Assert(cbToWriteStream >= cbChunk);
+            cbToWriteStream -= (uint32_t)cbChunk;
+
+            cbWrittenStream += cbChunk;
+            Assert(cbWrittenStream <= cbBuf);
+        }
+
+        Log3Func(("[%s] cbBuf=%RU32, cbWrittenBuf=%RU32, cbWrittenStream=%RU32\n",
+                  pMixStream->pszName, cbBuf, cbWrittenBuf, cbWrittenStream));
+
+        if (cbWrittenBuf < cbBuf)
         {
             LogFunc(("[%s] Warning: Only written %RU32/%RU32 bytes for stream '%s'\n",
-                     pSink->pszName, cbWritten, cbBuf, pMixStream->pszName));
+                     pSink->pszName, cbWrittenBuf, cbBuf, pMixStream->pszName));
             LogRel2(("Mixer: Buffer overrun for mixer stream '%s' (sink '%s')\n", pMixStream->pszName, pSink->pszName));
 #ifdef DEBUG_andy
             AssertFailed();
 #endif
-        }
-
-        cbWrittenMin = RT_MIN(cbWrittenMin, cbWritten);
-
-        if (cbWritten) /* Update the mixer stream's last written time stamp. */
-            pMixStream->tsLastReadWrittenNs = RTTimeNanoTS();
-
-        cbToWrite = RT_MIN(pMixStream->pConn->pfnStreamGetWritable(pMixStream->pConn, pMixStream->pStream),
-                           (uint32_t)RTCircBufUsed(pCircBuf));
-        cbToWrite = DrvAudioHlpBytesAlign(cbToWrite, &pSink->PCMProps);
-
-        int rc2 = VINF_SUCCESS;
-
-        while (cbToWrite)
-        {
-            RTCircBufAcquireReadBlock(pCircBuf, cbToWrite, &pvChunk, &cbChunk);
-
-            if (cbChunk)
-            {
-                rc2 = pMixStream->pConn->pfnStreamWrite(pMixStream->pConn, pMixStream->pStream, pvChunk, (uint32_t)cbChunk,
-                                                        &cbWritten);
-                if (RT_FAILURE(rc2))
-                    LogFunc(("[%s] Failed writing to stream '%s': %Rrc\n", pSink->pszName, pMixStream->pszName, rc2));
-            }
-
-            RTCircBufReleaseReadBlock(pCircBuf, cbWritten);
-
-            if (   !cbWritten
-                || cbWritten < cbChunk)
-            {
-#ifdef DEBUG_andy
-                AssertFailed();
-#endif
-                break;
-            }
-
-            if (RT_FAILURE(rc2))
-                break;
-
-            Assert(cbToWrite >= cbChunk);
-            cbToWrite -= (uint32_t)cbChunk;
         }
     }