Changeset 56649 in vbox

Timestamp:

Jun 26, 2015 6:55:41 AM (9 years ago)

Author:

vboxsync

Message:

RT_MIN is a macro

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvHostALSAAudio.cpp (modified) (1 diff)
• DrvHostCoreAudio.cpp (modified) (1 diff)

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

@@ -824 +824 @@
      */
     Assert(cAvail);
-    size_t cbToRead = RT_MIN(AUDIOMIXBUF_S2B(&pHstStrmIn->MixBuf, cAvail),
-                             AudioMixBufFreeBytes(&pHstStrmIn->MixBuf));
+    size_t cbMixFree = AudioMixBufFreeBytes(&pHstStrmIn->MixBuf);
+    size_t cbToRead = RT_MIN((size_t)AUDIOMIXBUF_S2B(&pHstStrmIn->MixBuf, cAvail), cbMixFree);
 
     LogFlowFunc(("cbToRead=%zu, cAvail=%RI32\n", cbToRead, cAvail));

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

@@ -1507 +1507 @@
     do
     {
-        size_t cbBuf = RT_MIN(AudioMixBufSizeBytes(&pHstStrmOut->MixBuf), pStreamOut->cbPCMBuf);
+        size_t cbMixBuf = AudioMixBufSizeBytes(&pHstStrmOut->MixBuf);
+        size_t cbBuf    = RT_MIN(cbMixBuf, pStreamOut->cbPCMBuf);
         size_t cbToRead = RT_MIN(cbBuf, RTCircBufFree(pStreamOut->pBuf));
         LogFlowFunc(("cbToRead=%zu\n", cbToRead));