Changeset 67826 in vbox

Timestamp:

Jul 6, 2017 2:13:48 PM (8 years ago)

Author:

vboxsync

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

116758

Message:

Audio/DevIchAc97.cpp: Fixes for ichac97StreamRead().

File:

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

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

@@ -911 +911 @@
     /* pcbRead is optional. */
 
+    int rc = VINF_SUCCESS;
+
+    uint32_t cbReadTotal = 0;
+
     PRTCIRCBUF pCircBuf = pSrcStream->State.pCircBuf;
     AssertPtr(pCircBuf);
@@ -917 +921 @@
     size_t cbSrc;
 
-    uint32_t cbWritten = 0;
-
-    RTCircBufAcquireReadBlock(pCircBuf, cbToRead, &pvSrc, &cbSrc);
-
-    if (cbSrc)
-    {
+    while (cbToRead)
+    {
+        uint32_t cbWritten = 0;
+
+        RTCircBufAcquireReadBlock(pCircBuf, cbToRead, &pvSrc, &cbSrc);
+
+        if (cbSrc)
+        {
 #ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
-        RTFILE fh;
-        RTFileOpen(&fh, VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "ac97StreamRead.pcm",
-                   RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
-        RTFileWrite(fh, pvSrc, cbSrc, NULL);
-        RTFileClose(fh);
+            RTFILE fh;
+            RTFileOpen(&fh, VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "ac97StreamRead.pcm",
+                       RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
+            RTFileWrite(fh, pvSrc, cbSrc, NULL);
+            RTFileClose(fh);
 #endif
-        int rc2 = AudioMixerSinkWrite(pDstMixSink, AUDMIXOP_COPY, pvSrc, (uint32_t)cbSrc, &cbWritten);
-        AssertRC(rc2);
-
-#ifdef DEBUG_andy
-        Assert(cbWritten == cbSrc);
-#endif
-    }
-
-    RTCircBufReleaseReadBlock(pCircBuf, cbWritten);
+            rc = AudioMixerSinkWrite(pDstMixSink, AUDMIXOP_COPY, pvSrc, (uint32_t)cbSrc, &cbWritten);
+            if (RT_SUCCESS(rc))
+            {
+                Assert(cbWritten <= cbSrc);
+
+                cbReadTotal += cbWritten;
+
+                Assert(cbToRead >= cbWritten);
+                cbToRead    -= cbWritten;
+            }
+        }
+
+        RTCircBufReleaseReadBlock(pCircBuf, cbWritten);
+
+        if (   !cbWritten
+            || !RTCircBufUsed(pCircBuf))
+               break;
+
+        if (RT_FAILURE(rc))
+            break;
+    }
 
     if (pcbRead)
-        *pcbRead = cbWritten;
-
-    return VINF_SUCCESS;
+        *pcbRead = cbReadTotal;
+
+    return rc;
 }
 
@@ -1249 +1267 @@
             {
                 /* Read (guest output) data and write it to the stream's sink. */
-                rc2 = ichac97StreamRead(pThis, pStream, pSink, cbUsed, NULL /* pcbRead */);
+                uint32_t cbRead;
+                rc2 = ichac97StreamRead(pThis, pStream, pSink, cbUsed, &cbRead);
                 AssertRC(rc2);
+
+                AssertMsg(cbUsed == cbRead, ("[SD%RU8] %RU32 bytes announced to be ready to read but %RU32 bytes read\n",
+                                             pStream->u8SD, cbUsed, cbRead));
             }