Changeset 74035 in vbox for trunk/src

Timestamp:

Sep 3, 2018 9:47:49 AM (6 years ago)

Author:

vboxsync

Message:

Audio/DrvHostCoreAudio: Handle 0-byte write blocks in coreAudioInputQueueProcBuffer().

File:

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

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

@@ -1366 +1366 @@
 
     size_t cbToWrite = audioBuffer->mAudioDataByteSize;
-    size_t cbLeft    = cbToWrite;
+    size_t cbLeft    = RT_MIN(cbToWrite, RTCircBufFree(pCircBuf));
 
     while (cbLeft)
@@ -1373 +1373 @@
         RTCircBufAcquireWriteBlock(pCircBuf, cbLeft, (void **)&pvDst, &cbToWrite);
 
-        if (!cbToWrite)
-            break;
-
-        /* Copy the data from our ring buffer to the core audio buffer. */
-        memcpy((UInt8 *)pvDst, pvSrc + cbWritten, cbToWrite);
+        if (cbToWrite)
+        {
+            /* Copy the data from our ring buffer to the core audio buffer. */
+            memcpy((UInt8 *)pvDst, pvSrc + cbWritten, cbToWrite);
+        }
 
         /* Release the read buffer, so it could be used for new data. */