Changeset 67467 in vbox

Timestamp:

Jun 19, 2017 10:27:57 AM (8 years ago)

Author:

vboxsync

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

116203

Message:

Audio/DevHDA: Cleaned up hdaStreamRead() / hdaStreamWrite().

File:

• trunk/src/VBox/Devices/Audio/DevHDA.cpp (modified) (2 diffs)

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

@@ -4876 +4876 @@
     AssertPtr(pCircBuf);
 
-    void *pvDst;
-    size_t cbDst;
-
-    uint32_t cbWritten = 0;
-
-    RTCircBufAcquireWriteBlock(pCircBuf, cbToWrite, &pvDst, &cbDst);
-
-    if (cbDst)
-    {
-        int rc2 = AudioMixerSinkRead(pSink->pMixSink, AUDMIXOP_COPY, pvDst, (uint32_t)cbDst, &cbWritten);
-        AssertRC(rc2);
-
-        Assert(cbDst >= cbWritten);
-        Log2Func(("[SD%RU8]: %zu/%zu bytes written\n", pStream->u8SD, cbWritten, cbDst));
+    int rc = VINF_SUCCESS;
+
+    uint32_t cbWrittenTotal = 0;
+    uint32_t cbLeft         = RT_MIN(cbToWrite, (uint32_t)RTCircBufFree(pCircBuf));
+
+    while (cbLeft)
+    {
+        void *pvDst;
+        size_t cbDst;
+
+        uint32_t cbRead = 0;
+
+        RTCircBufAcquireWriteBlock(pCircBuf, cbToWrite, &pvDst, &cbDst);
+
+        if (cbDst)
+        {
+            rc = AudioMixerSinkRead(pSink->pMixSink, AUDMIXOP_COPY, pvDst, (uint32_t)cbDst, &cbRead);
+            AssertRC(rc);
+
+            Assert(cbDst >= cbRead);
+            Log2Func(("[SD%RU8]: %zu/%zu bytes read\n", pStream->u8SD, cbRead, cbDst));
 
 #ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
-        RTFILE fh;
-        RTFileOpen(&fh, VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "hdaStreamWrite.pcm",
-                   RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
-        RTFileWrite(fh, pvDst, cbWritten, NULL);
-        RTFileClose(fh);
-#endif
-    }
-
-    RTCircBufReleaseWriteBlock(pCircBuf, cbWritten);
+            RTFILE fh;
+            RTFileOpen(&fh, VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "hdaStreamWrite.pcm",
+                       RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
+            RTFileWrite(fh, pvDst, cbRead, NULL);
+            RTFileClose(fh);
+#endif
+        }
+
+        RTCircBufReleaseWriteBlock(pCircBuf, cbRead);
+
+        if (RT_FAILURE(rc))
+            break;
+
+        Assert(cbLeft  >= cbRead);
+        cbLeft         -= cbRead;
+
+        cbWrittenTotal += cbRead;
+    }
 
     if (pcbWritten)
-        *pcbWritten = cbWritten;
-
-    return VINF_SUCCESS;
+        *pcbWritten = cbWrittenTotal;
+
+    return rc;
 }
 
@@ -4938 +4954 @@
     AssertPtr(pCircBuf);
 
-    void *pvSrc;
-    size_t cbSrc;
-
-    uint32_t cbRead = 0;
-
-    RTCircBufAcquireReadBlock(pCircBuf, cbToRead, &pvSrc, &cbSrc);
-
-    if (cbSrc)
-    {
-        Log2Func(("[SD%RU8]: Reading %zu bytes ...\n", pStream->u8SD, cbSrc));
-
+    int rc = VINF_SUCCESS;
+
+    uint32_t cbReadTotal = 0;
+    uint32_t cbLeft      = RT_MIN(cbToRead, (uint32_t)RTCircBufUsed(pCircBuf));
+
+    while (cbLeft)
+    {
+        void *pvSrc;
+        size_t cbSrc;
+
+        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 "hdaStreamRead.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(pSink->pMixSink, AUDMIXOP_COPY, pvSrc, (uint32_t)cbSrc, &cbRead);
-        AssertRC(rc2);
-
-        Assert(cbSrc >= cbRead);
-        Log2Func(("[SD%RU8]: %zu/%zu bytes read\n", pStream->u8SD, cbRead, cbSrc));
-    }
-
-    RTCircBufReleaseReadBlock(pCircBuf, cbRead);
+            RTFILE fh;
+            RTFileOpen(&fh, VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "hdaStreamRead.pcm",
+                       RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
+            RTFileWrite(fh, pvSrc, cbSrc, NULL);
+            RTFileClose(fh);
+#endif
+            rc = AudioMixerSinkWrite(pSink->pMixSink, AUDMIXOP_COPY, pvSrc, (uint32_t)cbSrc, &cbWritten);
+            AssertRC(rc);
+
+            Assert(cbSrc >= cbWritten);
+            Log2Func(("[SD%RU8]: %zu/%zu bytes read\n", pStream->u8SD, cbWritten, cbSrc));
+        }
+
+        RTCircBufReleaseReadBlock(pCircBuf, cbWritten);
+
+        if (RT_FAILURE(rc))
+            break;
+
+        Assert(cbLeft  >= cbWritten);
+        cbLeft         -= cbWritten;
+
+        cbReadTotal    += cbWritten;
+    }
 
     if (pcbRead)
-        *pcbRead = cbRead;
-
-    return VINF_SUCCESS;
+        *pcbRead = cbReadTotal;
+
+    return rc;
 }