儲存庫 vbox 的更動 67501

時間撮記:

2017-6-20 上午11:49:55 (7 年 以前)

作者:

vboxsync

訊息:

Audio/DrvAudio.cpp: Fixes for drvAudioStreamCaptureRaw().

檔案:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (修改) (1 筆差異)

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

@@ -1678 +1678 @@
     for (;;)
     {
-        uint32_t csReadable = pThis->pHostDrvAudio->pfnStreamGetReadable(pThis->pHostDrvAudio, pHstStream->pvBackend);
-        if (!csReadable)
+        uint32_t cbReadable = pThis->pHostDrvAudio->pfnStreamGetReadable(pThis->pHostDrvAudio, pHstStream->pvBackend);
+        if (!cbReadable) /* Nothing to read on the backend side? Bail out. */
             break;
 
-        uint32_t csFree = AudioMixBufFree(&pHstStream->MixBuf);
-        if (!csFree)
+        const uint32_t cbFree = AudioMixBufFreeBytes(&pHstStream->MixBuf);
+        if (!cbFree) /* No space left in the host stream? */
             break;
 
-        if (csFree < csReadable) /* More data captured than we can read? */
-        {
-            /** @todo Warn? */
-        }
+        if (cbReadable > cbFree) /* Don't capture more than the host stream currently can hold. */
+            cbReadable = cbFree;
 
         PPDMAUDIOSAMPLE paSamples;
         uint32_t csWritable;
-        rc = AudioMixBufPeekMutable(&pHstStream->MixBuf, csReadable, &paSamples, &csWritable);
-        if (RT_FAILURE(rc))
+        rc = AudioMixBufPeekMutable(&pHstStream->MixBuf, AUDIOMIXBUF_B2S(&pHstStream->MixBuf, cbReadable),
+                                    &paSamples, &csWritable);
+        if (   RT_FAILURE(rc)
+            || !csWritable)
+        {
             break;
+        }
 
         uint32_t csCaptured;