Changeset 76853 in vbox for trunk/src/VBox/Devices

Timestamp:

Jan 17, 2019 11:42:06 AM (6 years ago)

Author:

vboxsync

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

128213

Message:

Audio/AC97: Cleaned up ichac97R3StreamRead().

File:

• trunk/src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (3 diffs)

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

@@ -1183 +1183 @@
     /* pcbRead is optional. */
 
-    int rc = VINF_SUCCESS;
-
-    uint32_t cbReadTotal = 0;
-
     PRTCIRCBUF pCircBuf = pSrcStream->State.pCircBuf;
     AssertPtr(pCircBuf);
@@ -1193 +1189 @@
     size_t cbSrc;
 
-    while (cbToRead)
+    int rc = VINF_SUCCESS;
+
+    uint32_t cbReadTotal = 0;
+    uint32_t cbLeft      = RT_MIN(cbToRead, (uint32_t)RTCircBufUsed(pCircBuf));
+
+    while (cbLeft)
     {
         uint32_t cbWritten = 0;
 
-        RTCircBufAcquireReadBlock(pCircBuf, cbToRead, &pvSrc, &cbSrc);
+        RTCircBufAcquireReadBlock(pCircBuf, cbLeft, &pvSrc, &cbSrc);
 
         if (cbSrc)
@@ -1205 +1206 @@
 
             rc = AudioMixerSinkWrite(pDstMixSink, AUDMIXOP_COPY, pvSrc, (uint32_t)cbSrc, &cbWritten);
-            if (RT_SUCCESS(rc))
-            {
-                Assert(cbWritten <= cbSrc);
-
-                cbReadTotal += cbWritten;
-
-                Assert(cbToRead >= cbWritten);
-                cbToRead    -= cbWritten;
-            }
+            AssertRC(rc);
+
+            Assert(cbSrc >= cbWritten);
+            Log3Func(("[SD%RU8] %RU32/%zu bytes read\n", pSrcStream->u8SD, cbWritten, cbSrc));
         }
 
         RTCircBufReleaseReadBlock(pCircBuf, cbWritten);
-
-        if (   !cbWritten
-            || !RTCircBufUsed(pCircBuf))
-               break;
 
         if (RT_FAILURE(rc))
             break;
+
+        Assert(cbLeft  >= cbWritten);
+        cbLeft         -= cbWritten;
+
+        cbReadTotal    += cbWritten;
     }