Changeset 65565 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 1, 2017 2:11:10 PM (8 years ago)

Author:

vboxsync

Message:

Audio: Make use of pvBuf/cbBuf parameters in PDMIHOSTAUDIO::pfnStreamPlay() and PDMIHOSTAUDIO::pfnStreamCapture() to further abstract the backends from the audio connector. The backends now won't be allowed to operate on the audio connector's mixing buffers directly anymore that way.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvAudio.cpp (modified) (21 diffs)
• DrvHostALSAAudio.cpp (modified) (16 diffs)
• DrvHostCoreAudio.cpp (modified) (2 diffs)
• DrvHostDSound.cpp (modified) (24 diffs)
• DrvHostDebugAudio.cpp (modified) (9 diffs)
• DrvHostNullAudio.cpp (modified) (11 diffs)
• DrvHostOSSAudio.cpp (modified) (17 diffs)
• DrvHostPulseAudio.cpp (modified) (16 diffs)
• DrvHostValidationKit.cpp (modified) (2 diffs)

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

@@ -633 +633 @@
     /* No sample buffer size hint given by the backend? Default to some sane value. */
     if (!CfgHostAcq.cSampleBufferSize)
+    {
         CfgHostAcq.cSampleBufferSize = _1K; /** @todo Make this configurable? */
+    }
 
     PDMAUDIOPCMPROPS PCMProps;
@@ -642 +644 @@
     AudioMixBufDestroy(&pHstStream->MixBuf);
 
-    LogFlowFunc(("[%s] cSamples=%RU32\n", pHstStream->szName, CfgHostAcq.cSampleBufferSize * 4));
-
-    rc2 = AudioMixBufInit(&pHstStream->MixBuf, pHstStream->szName, &PCMProps, CfgHostAcq.cSampleBufferSize * 10);
+    CfgHostAcq.cSampleBufferSize *= 10; /** @todo Make this configurable. */
+
+    LogFlowFunc(("[%s] cSamples=%RU32\n", pHstStream->szName, CfgHostAcq.cSampleBufferSize));
+
+    rc2 = AudioMixBufInit(&pHstStream->MixBuf, pHstStream->szName, &PCMProps, CfgHostAcq.cSampleBufferSize);
     AssertRC(rc2);
 
@@ -661 +665 @@
     AudioMixBufDestroy(&pGstStream->MixBuf);
 
-    LogFlowFunc(("[%s] cSamples=%RU32\n", pGstStream->szName, CfgHostAcq.cSampleBufferSize * 2));
-
-    rc2 = AudioMixBufInit(&pGstStream->MixBuf, pGstStream->szName, &PCMProps, CfgHostAcq.cSampleBufferSize * 20);
+    CfgHostAcq.cSampleBufferSize *= 20; /** @todo Make this configurable. */
+
+    LogFlowFunc(("[%s] cSamples=%RU32\n", pGstStream->szName, CfgHostAcq.cSampleBufferSize));
+
+    rc2 = AudioMixBufInit(&pGstStream->MixBuf, pGstStream->szName, &PCMProps, CfgHostAcq.cSampleBufferSize);
     AssertRC(rc2);
 
@@ -852 +858 @@
 #endif
 
+#ifdef LOG_ENABLED
+    char *pszGstSts = NULL;
+    char *pszHstSts = NULL;
+#endif
+
     do
     {
@@ -869 +880 @@
         }
 
+#ifdef LOG_ENABLED
+        pszHstSts = dbgAudioStreamStatusToStr(pHstStream->fStatus);
+        AssertPtr(pszHstSts);
+#endif
         PPDMAUDIOSTREAM pGstStream = pHstStream->pPair;
         AssertPtr(pGstStream);
 
 #ifdef LOG_ENABLED
-        char *pszGstSts = dbgAudioStreamStatusToStr(pGstStream->fStatus);
+        pszGstSts = dbgAudioStreamStatusToStr(pGstStream->fStatus);
+        AssertPtr(pszGstSts);
+#endif
+
+#ifdef LOG_ENABLED
         AssertMsg(pGstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED,
-                  ("Writing to disabled guest output stream \"%s\" not possible (status is %s)\n",
-                   pGstStream->szName, pszGstSts));
-        RTStrFree(pszGstSts);
+                  ("Writing to disabled guest output stream \"%s\" not possible (status is %s, host status %s)\n",
+                   pGstStream->szName, pszGstSts, pszHstSts));
 #endif
         pGstStream->Out.tsLastWriteMS = RTTimeMilliTS();
@@ -884 +902 @@
         {
             LogRel2(("Audio: Guest stream '%s' full, expect stuttering audio output\n", pGstStream->szName));
+
 #ifdef DEBUG_andy
-            AssertMsgFailed(("%s: Guest stream full: cbBuf=%RU32\n", pGstStream->szName, cbBuf));
+            AssertMsgFailed(("[%s] Failed because guest stream full (guest status %s, host status %s): cbBuf=%RU32\n",
+                             pGstStream->szName, pszGstSts, pszHstSts, cbBuf));
 #endif
             break;
@@ -903 +923 @@
             || !csWritten)
         {
-            AssertMsgFailed(("%s: Write failed: cbBuf=%RU32, csWritten=%RU32, rc=%Rrc\n",
-                             pGstStream->szName, cbBuf, csWritten, rc));
+            AssertMsgFailed(("[%s] Write failed (guest status %s, host status %s): cbBuf=%RU32, csWritten=%RU32, rc=%Rrc\n",
+                             pGstStream->szName, pszGstSts, pszHstSts, cbBuf, csWritten, rc));
         }
 #endif
@@ -925 +945 @@
                 || csMixed < csWritten)
             {
-                AssertMsgFailed(("%s: Mixing failed: cbBuf=%RU32, csWritten=%RU32, csMixed=%RU32, rc=%Rrc\n",
-                                 pGstStream->szName, cbBuf, csWritten, csMixed, rc2));
+                AssertMsgFailed(("[%s] Mixing failed (guest status %s, host status %s): cbBuf=%RU32, csWritten=%RU32, csMixed=%RU32, rc=%Rrc\n",
+                                 pGstStream->szName, pszGstSts, pszHstSts, cbBuf, csWritten, csMixed, rc2));
             }
 #endif
@@ -948 +968 @@
 
     } while (0);
+
+#ifdef LOG_ENABLED
+    RTStrFree(pszHstSts);
+    RTStrFree(pszGstSts);
+#endif
 
     int rc2 = RTCritSectLeave(&pThis->CritSect);
@@ -1102 +1127 @@
                     else
                         LogRel2(("Audio: Mixing to guest input stream '%s' failed: %Rrc\n", pGstStream->szName, rc));
-#ifdef DEBUG_andy
+#ifdef DEBUG_andy_disabled
                     AssertFailed();
 #endif
@@ -1225 +1250 @@
 
         AssertReleaseMsgBreakStmt(pHstStream != NULL,
-                                  ("%s: Host stream is NULL (cRefs=%RU32, fStatus=%x, enmCtx=%ld)\n",
+                                  ("[%s] Host stream is NULL (cRefs=%RU32, fStatus=%x, enmCtx=%ld)\n",
                                    pStream->szName, pStream->cRefs, pStream->fStatus, pStream->enmCtx),
                                   rc = VERR_NOT_AVAILABLE);
         AssertReleaseMsgBreakStmt(pGstStream != NULL,
-                                  ("%s: Guest stream is NULL (cRefs=%RU32, fStatus=%x, enmCtx=%ld)\n",
+                                  ("[%s] Guest stream is NULL (cRefs=%RU32, fStatus=%x, enmCtx=%ld)\n",
                                    pStream->szName, pStream->cRefs, pStream->fStatus, pStream->enmCtx),
                                   rc = VERR_NOT_AVAILABLE);
@@ -1249 +1274 @@
             && (stsBackend & PDMAUDIOSTRMSTS_FLAG_DATA_WRITABLE))
         {
+            uint8_t u8Buf[_1K];
+
+            uint32_t cRead = 0;
+            int rc2 = AudioMixBufReadCirc(&pHstStream->MixBuf, u8Buf, sizeof(u8Buf), &cRead);
+            AssertRC(rc2);
+
+            uint32_t cbBuf = AUDIOMIXBUF_S2B(&pHstStream->MixBuf, cRead);
+            uint32_t cbPlayed = 0;
+
             AssertPtr(pThis->pHostDrvAudio->pfnStreamPlay);
-            rc = pThis->pHostDrvAudio->pfnStreamPlay(pThis->pHostDrvAudio, pHstStream, NULL /* pvBuf */, 0 /* cbBuf */,
-                                                     &csPlayed);
+            rc = pThis->pHostDrvAudio->pfnStreamPlay(pThis->pHostDrvAudio, pHstStream, u8Buf, cbBuf, &cbPlayed);
             if (RT_SUCCESS(rc))
             {
+                csPlayed = AUDIOMIXBUF_B2S(&pHstStream->MixBuf, cbPlayed);
+
+                AudioMixBufFinish(&pHstStream->MixBuf, csPlayed);
+
 #ifdef VBOX_WITH_STATISTICS
                 STAM_COUNTER_ADD(&pThis->Stats.TotalSamplesOut, csPlayed);
@@ -1331 +1368 @@
 
         AssertReleaseMsgBreakStmt(pHstStream != NULL,
-                                  ("%s: Host stream is NULL (cRefs=%RU32, fStatus=%x, enmCtx=%ld)\n",
+                                  ("[%s] Host stream is NULL (cRefs=%RU32, fStatus=%x, enmCtx=%ld)\n",
                                    pStream->szName, pStream->cRefs, pStream->fStatus, pStream->enmCtx),
                                   rc = VERR_NOT_AVAILABLE);
         AssertReleaseMsgBreakStmt(pGstStream != NULL,
-                                  ("%s: Guest stream is NULL (cRefs=%RU32, fStatus=%x, enmCtx=%ld)\n",
+                                  ("[%s] Guest stream is NULL (cRefs=%RU32, fStatus=%x, enmCtx=%ld)\n",
                                    pStream->szName, pStream->cRefs, pStream->fStatus, pStream->enmCtx),
                                   rc = VERR_NOT_AVAILABLE);
@@ -1348 +1385 @@
                 && (stsBackend & PDMAUDIOSTRMSTS_FLAG_DATA_READABLE))
             {
-                rc = pThis->pHostDrvAudio->pfnStreamCapture(pThis->pHostDrvAudio, pHstStream, NULL /* pvBuf */, 0 /* cbBuf */,
-                                                            &csCaptured);
+                uint8_t  auBuf[_1K];
+                uint32_t cbCaptured;
+
+                rc = pThis->pHostDrvAudio->pfnStreamCapture(pThis->pHostDrvAudio, pHstStream, auBuf, sizeof(auBuf), &cbCaptured);
                 if (RT_FAILURE(rc))
                 {
@@ -1357 +1396 @@
                 else
                 {
+                    Assert(cbCaptured <= sizeof(auBuf));
+                    rc = AudioMixBufWriteCirc(&pHstStream->MixBuf, auBuf, cbCaptured, &csCaptured);
+                    if (RT_SUCCESS(rc))
+                    {
 #ifdef VBOX_WITH_STATISTICS
-                    STAM_COUNTER_ADD(&pThis->Stats.TotalSamplesIn,  csCaptured);
-                    STAM_COUNTER_ADD(&pHstStream->In.StatSamplesCaptured, csCaptured);
-#endif
-                    Log3Func(("[%s] %RU32 samples captured\n", pHstStream->szName, csCaptured));
+                        STAM_COUNTER_ADD(&pThis->Stats.TotalSamplesIn,        csCaptured);
+                        STAM_COUNTER_ADD(&pHstStream->In.StatSamplesCaptured, csCaptured);
+#endif
+                        Log3Func(("[%s] %RU32 samples captured\n", pHstStream->szName, csCaptured));
+                    }
                 }
             }
@@ -2277 +2321 @@
     AssertPtrReturn(pVol,       VERR_INVALID_POINTER);
 
-    LogFlowFunc(("%s: volL=%RU32, volR=%RU32, fMute=%RTbool\n", pStream->szName, pVol->uLeft, pVol->uRight, pVol->fMuted));
+    LogFlowFunc(("[%s] volL=%RU32, volR=%RU32, fMute=%RTbool\n", pStream->szName, pVol->uLeft, pVol->uRight, pVol->fMuted));
 
     PPDMAUDIOSTREAM pHstStream = drvAudioGetHostStream(pStream);
@@ -2302 +2346 @@
     PDMAUDIODIR enmDir = pStream->enmDir;
 
-    LogFlowFunc(("%s: cRefs=%RU32\n", pStream->szName, pStream->cRefs));
+    LogFlowFunc(("[%s] cRefs=%RU32\n", pStream->szName, pStream->cRefs));
     if (pStream->cRefs > 1)
         rc = VERR_WRONG_ORDER;
@@ -2469 +2513 @@
 #ifdef LOG_ENABLED
     char *pszHstSts = dbgAudioStreamStatusToStr(pHstStream->fStatus);
-    LogFunc(("%s: fStatus=%s\n", pHstStream->szName, pszHstSts));
+    LogFunc(("[%s] fStatus=%s\n", pHstStream->szName, pszHstSts));
     RTStrFree(pszHstSts);
 #endif /* LOG_ENABLED */
@@ -2480 +2524 @@
             rc = pThis->pHostDrvAudio->pfnStreamDestroy(pThis->pHostDrvAudio, pHstStream);
         if (RT_SUCCESS(rc))
+        {
             pHstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_INITIALIZED;
-    }
-
-    LogFlowFunc(("%s: Returning %Rrc\n", pHstStream->szName, rc));
+            Assert(pHstStream->fStatus == PDMAUDIOSTRMSTS_FLAG_NONE);
+        }
+    }
+
+    LogFlowFunc(("[%s] Returning %Rrc\n", pHstStream->szName, rc));
     return rc;
 }
@@ -2499 +2546 @@
     AssertPtrReturn(pStream, VERR_INVALID_POINTER);
 
-    LogFlowFunc(("%s: cRefs=%RU32\n", pStream->szName, pStream->cRefs));
+    LogFlowFunc(("[%s] cRefs=%RU32\n", pStream->szName, pStream->cRefs));
 
     if (pStream->cRefs > 1)
@@ -2512 +2559 @@
             rc = drvAudioStreamControlInternal(pThis, pStream, PDMAUDIOSTREAMCMD_DISABLE);
             if (RT_SUCCESS(rc))
+            {
                 pStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_INITIALIZED;
+                Assert(pStream->fStatus == PDMAUDIOSTRMSTS_FLAG_NONE);
+            }
         }
     }

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -60 +60 @@
 
 #include "DrvAudio.h"
-#include "AudioMixBuffer.h"
-
 #include "VBoxDD.h"
 
@@ -83 +81 @@
      *  Note: Always must come first! */
     PDMAUDIOSTREAM      Stream;
+    /** The PCM properties of this stream. */
+    PDMAUDIOPCMPROPS    Props;
     snd_pcm_t          *phPCM;
     void               *pvBuf;
@@ -93 +93 @@
      *  Note: Always must come first! */
     PDMAUDIOSTREAM      Stream;
+    /** The PCM properties of this stream. */
+    PDMAUDIOPCMPROPS    Props;
     snd_pcm_t          *phPCM;
     void               *pvBuf;
@@ -1015 +1017 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
  */
-static DECLCALLBACK(int) drvHostALSAAudioStreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
-{
-    RT_NOREF(pvBuf, cbBuf);
+static DECLCALLBACK(int) drvHostALSAAudioStreamCapture(PPDMIHOSTAUDIO pInterface,
+                                                       PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
+{
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
+    AssertPtrReturn(pvBuf,      VERR_INVALID_POINTER);
+    AssertReturn(cbBuf,         VERR_INVALID_PARAMETER);
     /* pcbRead is optional. */
 
-    PALSAAUDIOSTREAMIN pThisStream = (PALSAAUDIOSTREAMIN)pStream;
+    PALSAAUDIOSTREAMIN pStreamALSA = (PALSAAUDIOSTREAMIN)pStream;
 
     snd_pcm_sframes_t cAvail;
-    int rc = alsaStreamGetAvail(pThisStream->phPCM, &cAvail);
+    int rc = alsaStreamGetAvail(pStreamALSA->phPCM, &cAvail);
     if (RT_FAILURE(rc))
     {
@@ -1034 +1038 @@
     if (!cAvail) /* No data yet? */
     {
-        snd_pcm_state_t state = snd_pcm_state(pThisStream->phPCM);
+        snd_pcm_state_t state = snd_pcm_state(pStreamALSA->phPCM);
         switch (state)
         {
             case SND_PCM_STATE_PREPARED:
-                cAvail = AudioMixBufFree(&pStream->MixBuf);
+                cAvail = PDMAUDIOPCMPROPS_B2S(&pStreamALSA->Props, cbBuf);
                 break;
 
             case SND_PCM_STATE_SUSPENDED:
             {
-                rc = alsaStreamResume(pThisStream->phPCM);
+                rc = alsaStreamResume(pStreamALSA->phPCM);
                 if (RT_FAILURE(rc))
                     break;
@@ -1068 +1072 @@
      * the mixer buffer.
      */
-    Assert(cAvail);
-    size_t cbMixFree = AudioMixBufFreeBytes(&pStream->MixBuf);
-    size_t cbToRead = RT_MIN((size_t)AUDIOMIXBUF_S2B(&pStream->MixBuf, cAvail), cbMixFree);
+    size_t cbToRead = RT_MIN((size_t)PDMAUDIOPCMPROPS_S2B(&pStreamALSA->Props, cAvail), cbBuf);
 
     LogFlowFunc(("cbToRead=%zu, cAvail=%RI32\n", cbToRead, cAvail));
 
-    uint32_t cWrittenTotal = 0;
+    uint32_t cbReadTotal = 0;
+
     snd_pcm_uframes_t cToRead;
     snd_pcm_sframes_t cRead;
@@ -1081 +1084 @@
            && RT_SUCCESS(rc))
     {
-        cToRead = RT_MIN(AUDIOMIXBUF_B2S(&pStream->MixBuf, cbToRead),
-                         AUDIOMIXBUF_B2S(&pStream->MixBuf, pThisStream->cbBuf));
+        cToRead = RT_MIN(PDMAUDIOPCMPROPS_B2S(&pStreamALSA->Props, cbToRead),
+                         PDMAUDIOPCMPROPS_B2S(&pStreamALSA->Props, pStreamALSA->cbBuf));
         AssertBreakStmt(cToRead, rc = VERR_NO_DATA);
-        cRead = snd_pcm_readi(pThisStream->phPCM, pThisStream->pvBuf, cToRead);
+        cRead = snd_pcm_readi(pStreamALSA->phPCM, pStreamALSA->pvBuf, cToRead);
         if (cRead <= 0)
         {
@@ -1109 +1112 @@
                 case -EPIPE:
                 {
-                    rc = alsaStreamRecover(pThisStream->phPCM);
+                    rc = alsaStreamRecover(pStreamALSA->phPCM);
                     if (RT_FAILURE(rc))
                         break;
@@ -1127 +1130 @@
         else
         {
-            uint32_t cWritten;
-            rc = AudioMixBufWriteCirc(&pStream->MixBuf,
-                                      pThisStream->pvBuf, AUDIOMIXBUF_S2B(&pStream->MixBuf, cRead),
-                                      &cWritten);
-            if (RT_FAILURE(rc))
-                break;
-
             /*
              * We should not run into a full mixer buffer or we loose samples and
@@ -1139 +1135 @@
              * capture device for example).
              */
-            AssertLogRelMsgBreakStmt(cWritten > 0, ("Mixer buffer shouldn't be full at this point!\n"),
-                                     rc = VERR_INTERNAL_ERROR);
-            uint32_t cbWritten = AUDIOMIXBUF_S2B(&pStream->MixBuf, cWritten);
-
-            Assert(cbToRead >= cbWritten);
-            cbToRead -= cbWritten;
-            cWrittenTotal += cWritten;
+            uint32_t cbRead = PDMAUDIOPCMPROPS_S2B(&pStreamALSA->Props, cRead);
+
+            memcpy(pvBuf, pStreamALSA->pvBuf, cbRead);
+
+            Assert(cbToRead >= cbRead);
+            cbToRead    -= cbRead;
+            cbReadTotal += cbRead;
         }
     }
@@ -1151 +1147 @@
     if (RT_SUCCESS(rc))
     {
-        uint32_t cProcessed = 0;
-        if (cWrittenTotal)
-            rc = AudioMixBufMixToParent(&pStream->MixBuf, cWrittenTotal,
-                                        &cProcessed);
-
         if (pcbRead)
-            *pcbRead = cWrittenTotal;
-
-        LogFlowFunc(("cWrittenTotal=%RU32 (%RU32 processed), rc=%Rrc\n",
-                     cWrittenTotal, cProcessed, rc));
+            *pcbRead = cbReadTotal;
     }
 
@@ -1170 +1158 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPlay}
  */
-static DECLCALLBACK(int) drvHostALSAAudioStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
-{
-    RT_NOREF(pvBuf, cbBuf);
+static DECLCALLBACK(int) drvHostALSAAudioStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream,
+                                                    const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
+{
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
+    AssertPtrReturn(pvBuf,      VERR_INVALID_POINTER);
+    AssertReturn(cbBuf,         VERR_INVALID_PARAMETER);
     /* pcbWritten is optional. */
 
-    PALSAAUDIOSTREAMOUT pThisStream = (PALSAAUDIOSTREAMOUT)pStream;
+    PALSAAUDIOSTREAMOUT pStreamALSA = (PALSAAUDIOSTREAMOUT)pStream;
 
     int rc = VINF_SUCCESS;
-    uint32_t cbReadTotal = 0;
+
+    uint32_t cbWrittenTotal = 0;
 
     do
     {
         snd_pcm_sframes_t cAvail;
-        rc = alsaStreamGetAvail(pThisStream->phPCM, &cAvail);
+        rc = alsaStreamGetAvail(pStreamALSA->phPCM, &cAvail);
         if (RT_FAILURE(rc))
         {
@@ -1192 +1183 @@
         }
 
-        size_t cbToRead = RT_MIN(AUDIOMIXBUF_S2B(&pStream->MixBuf,
-                                                 (uint32_t)cAvail), /* cAvail is always >= 0 */
-                                 AUDIOMIXBUF_S2B(&pStream->MixBuf,
-                                                 AudioMixBufLive(&pStream->MixBuf)));
-        LogFlowFunc(("cbToRead=%zu, cbAvail=%zu\n",
-                     cbToRead, AUDIOMIXBUF_S2B(&pStream->MixBuf, cAvail)));
-
-        uint32_t cRead, cbRead;
-        snd_pcm_sframes_t cWritten;
-        while (cbToRead)
-        {
-            rc = AudioMixBufReadCirc(&pStream->MixBuf, pThisStream->pvBuf, cbToRead, &cRead);
-            if (RT_FAILURE(rc))
-                break;
-
-            cbRead = AUDIOMIXBUF_S2B(&pStream->MixBuf, cRead);
-            AssertBreak(cbRead);
-
-            /* Don't try infinitely on recoverable errors. */
-            unsigned iTry;
-            for (iTry = 0; iTry < ALSA_RECOVERY_TRIES_MAX; iTry++)
+        size_t cbToRead = RT_MIN(PDMAUDIOPCMPROPS_S2B(&pStreamALSA->Props, cAvail), cbBuf);
+        if (!cbToRead)
+            break;
+
+        memcpy(pStreamALSA->pvBuf, pvBuf, cbToRead);
+
+        snd_pcm_sframes_t cWritten = 0;
+
+        /* Don't try infinitely on recoverable errors. */
+        unsigned iTry;
+        for (iTry = 0; iTry < ALSA_RECOVERY_TRIES_MAX; iTry++)
+        {
+            cWritten = snd_pcm_writei(pStreamALSA->phPCM, pStreamALSA->pvBuf,
+                                      PDMAUDIOPCMPROPS_B2S(&pStreamALSA->Props, cbToRead));
+            if (cWritten <= 0)
             {
-                cWritten = snd_pcm_writei(pThisStream->phPCM, pThisStream->pvBuf, cRead);
-                if (cWritten <= 0)
+                switch (cWritten)
                 {
-                    switch (cWritten)
+                    case 0:
                     {
-                        case 0:
+                        LogFunc(("Failed to write %zu bytes\n", cbToRead));
+                        rc = VERR_ACCESS_DENIED;
+                        break;
+                    }
+
+                    case -EPIPE:
+                    {
+                        rc = alsaStreamRecover(pStreamALSA->phPCM);
+                        if (RT_FAILURE(rc))
+                            break;
+
+                        LogFlowFunc(("Recovered from playback\n"));
+                        continue;
+                    }
+
+                    case -ESTRPIPE:
+                    {
+                        /* Stream was suspended and waiting for a recovery. */
+                        rc = alsaStreamResume(pStreamALSA->phPCM);
+                        if (RT_FAILURE(rc))
                         {
-                            LogFunc(("Failed to write %RU32 samples\n", cRead));
-                            rc = VERR_ACCESS_DENIED;
+                            LogRel(("ALSA: Failed to resume output stream\n"));
                             break;
                         }
 
-                        case -EPIPE:
-                        {
-                            rc = alsaStreamRecover(pThisStream->phPCM);
-                            if (RT_FAILURE(rc))
-                                break;
-
-                            LogFlowFunc(("Recovered from playback\n"));
-                            continue;
-                        }
-
-                        case -ESTRPIPE:
-                        {
-                            /* Stream was suspended and waiting for a recovery. */
-                            rc = alsaStreamResume(pThisStream->phPCM);
-                            if (RT_FAILURE(rc))
-                            {
-                                LogRel(("ALSA: Failed to resume output stream\n"));
-                                break;
-                            }
-
-                            LogFlowFunc(("Resumed suspended output stream\n"));
-                            continue;
-                        }
-
-                        default:
-                            LogFlowFunc(("Failed to write %RI32 output frames, rc=%Rrc\n",
-                                         cRead, rc));
-                            rc = VERR_GENERAL_FAILURE; /** @todo */
-                            break;
+                        LogFlowFunc(("Resumed suspended output stream\n"));
+                        continue;
                     }
+
+                    default:
+                        LogFlowFunc(("Failed to write %RU32 bytes, error unknown\n", cbToRead));
+                        rc = VERR_GENERAL_FAILURE; /** @todo */
+                        break;
                 }
-                else
-                    break;
-            } /* For number of tries. */
-
-            if (   iTry == ALSA_RECOVERY_TRIES_MAX
-                && cWritten <= 0)
-                rc = VERR_BROKEN_PIPE;
-
-            if (RT_FAILURE(rc))
+            }
+            else
                 break;
-
-            Assert(cbToRead >= cbRead);
-            cbToRead -= cbRead;
-            cbReadTotal += cbRead;
-        }
-    }
-    while (0);
+        } /* For number of tries. */
+
+        if (   iTry == ALSA_RECOVERY_TRIES_MAX
+            && cWritten <= 0)
+            rc = VERR_BROKEN_PIPE;
+
+        if (RT_FAILURE(rc))
+            break;
+
+        cbWrittenTotal = cbToRead;
+
+    } while (0);
 
     if (RT_SUCCESS(rc))
     {
-        uint32_t cReadTotal = AUDIOMIXBUF_B2S(&pStream->MixBuf, cbReadTotal);
-        if (cReadTotal)
-            AudioMixBufFinish(&pStream->MixBuf, cReadTotal);
-
         if (pcbWritten)
-            *pcbWritten = cReadTotal;
-
-        LogFlowFunc(("cReadTotal=%RU32 (%RU32 bytes), rc=%Rrc\n",
-                     cReadTotal, cbReadTotal, rc));
+            *pcbWritten = cbWrittenTotal;
     }
 
@@ -1333 +1304 @@
 static int alsaCreateStreamOut(PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
-    PALSAAUDIOSTREAMOUT pThisStream = (PALSAAUDIOSTREAMOUT)pStream;
+    PALSAAUDIOSTREAMOUT pStreamALSA = (PALSAAUDIOSTREAMOUT)pStream;
 
     snd_pcm_t *phPCM = NULL;
@@ -1365 +1336 @@
         pCfgAcq->cSampleBufferSize = obt.samples * 4;
 
-        PDMAUDIOPCMPROPS Props;
-        rc = DrvAudioHlpStreamCfgToProps(pCfgAcq, &Props);
+        rc = DrvAudioHlpStreamCfgToProps(pCfgAcq, &pStreamALSA->Props);
         if (RT_FAILURE(rc))
             break;
 
         AssertBreakStmt(obt.samples, rc = VERR_INVALID_PARAMETER);
-        size_t cbBuf = obt.samples * (1 << Props.cShift); /** @todo Get rid of using Props! */
+
+        size_t cbBuf = obt.samples * PDMAUDIOPCMPROPS_S2B(&pStreamALSA->Props, 1);
         AssertBreakStmt(cbBuf, rc = VERR_INVALID_PARAMETER);
-        pThisStream->pvBuf = RTMemAlloc(cbBuf);
-        if (!pThisStream->pvBuf)
-        {
-            LogRel(("ALSA: Not enough memory for output DAC buffer (%RU32 samples, each %d bytes)\n",
-                    obt.samples, 1 << Props.cShift));
+
+        pStreamALSA->pvBuf = RTMemAlloc(cbBuf);
+        if (!pStreamALSA->pvBuf)
+        {
+            LogRel(("ALSA: Not enough memory for output DAC buffer (%RU32 samples, %zu bytes)\n", obt.samples, cbBuf));
             rc = VERR_NO_MEMORY;
             break;
         }
 
-        pThisStream->cbBuf = cbBuf;
-        pThisStream->phPCM = phPCM;
+        pStreamALSA->cbBuf = cbBuf;
+        pStreamALSA->phPCM = phPCM;
     }
     while (0);

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010-2016 Oracle Corporation
+ * Copyright (C) 2010-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -23 +23 @@
 
 #include "DrvAudio.h"
-#include "AudioMixBuffer.h"
-
 #include "VBoxDD.h"
 

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

@@ -28 +28 @@
 #include <iprt/uuid.h>
 
-#include "AudioMixBuffer.h"
 #include "DrvAudio.h"
 #include "VBoxDD.h"
@@ -114 +113 @@
     LPDIRECTSOUNDBUFFER8 pDSB;
     DWORD                offPlayWritePos;
-    DWORD                cMaxSamplesInBuffer;
+    DWORD                cbPlayBuf;
     bool                 fEnabled;
     bool                 fRestartPlayback;
@@ -128 +127 @@
     LPDIRECTSOUNDCAPTURE8       pDSC;
     LPDIRECTSOUNDCAPTUREBUFFER8 pDSCB;
-    DWORD                       idxSampleCaptureReadPos;
-    DWORD                       cMaxSamplesInBuffer;
+    DWORD                       offCaptureBufRead;
+    DWORD                       cbCaptureBuf;
     HRESULT                     hrLastCapture;
     PDMAUDIORECSOURCE           enmRecSource;
@@ -284 +283 @@
         if (SUCCEEDED(hr))
         {
-            DWORD const cbBuffer = AUDIOMIXBUF_S2B(&pDSoundStream->Stream.MixBuf, pDSoundStream->cMaxSamplesInBuffer);
+            DWORD const cbBuffer = pDSoundStream->cbPlayBuf;
             if (pdwBuffer)
                 *pdwBuffer  = cbBuffer;
@@ -604 +603 @@
          *
          * Instead we're specifying DSBCAPS_LOCSOFTWARE, as this fits the bill
-         * of copying own buffer data (from AudioMixBuf) to our secondary's Direct Sound buffer.
+         * of copying own buffer data to our secondary's Direct Sound buffer.
          */
         bd.dwFlags     = DSBCAPS_GLOBALFOCUS | DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_LOCSOFTWARE;
@@ -681 +680 @@
          * playback buffer position.
          */
-        pDSoundStream->cMaxSamplesInBuffer = bc.dwBufferBytes >> pDSoundStream->Props.cShift;
-        DSLOG(("DSound: cMaxSamplesInBuffer=%RU32\n", pDSoundStream->cMaxSamplesInBuffer));
+        pDSoundStream->cbPlayBuf = bc.dwBufferBytes;
+        DSLOG(("DSound: cMaxSamplesInBuffer=%RU32\n", pDSoundStream->cbPlayBuf));
 
 #ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
@@ -745 +744 @@
     AssertPtrReturnVoid(pDSoundStream);
 
-    PPDMAUDIOSTREAM pStream = &pDSoundStream->Stream;
-
     PVOID pv1, pv2;
     DWORD cb1, cb2;
     HRESULT hr = directSoundPlayLock(pThis, pDSoundStream->pDSB, &pDSoundStream->Props,
-                                     0 /* dwOffset */, AUDIOMIXBUF_S2B(&pStream->MixBuf, pDSoundStream->cMaxSamplesInBuffer),
+                                     0 /* dwOffset */,
+                                     &pDSoundStream->Props, pDSoundStream->cbPlayBuf,
                                      &pv1, &pv2, &cb1, &cb2, DSBLOCK_ENTIREBUFFER);
     if (SUCCEEDED(hr))
     {
-        DWORD len1 = AUDIOMIXBUF_B2S(&pStream->MixBuf, cb1);
-        DWORD len2 = AUDIOMIXBUF_B2S(&pStream->MixBuf, cb2);
+        DWORD len1 = PDMAUDIOPCMPROPS_B2S(&pDSoundStream->Props, cb1);
+        DWORD len2 = PDMAUDIOPCMPROPS_B2S(&pDSoundStream->Props, cb2);
 
         if (pv1 && len1)
@@ -1148 +1146 @@
 
         /* Initial state: reading at the initial capture position, no error. */
-        pDSoundStream->idxSampleCaptureReadPos = offByteReadPos >> pDSoundStream->Props.cShift;
-        pDSoundStream->cMaxSamplesInBuffer     = bc.dwBufferBytes >> pDSoundStream->Props.cShift;
-        pDSoundStream->hrLastCapture           = S_OK;
-
-        DSLOG(("DSound: idxSampleCaptureReadPos=%RU32, cMaxSamplesInBuffer=%RU32\n",
-                     pDSoundStream->idxSampleCaptureReadPos, pDSoundStream->cMaxSamplesInBuffer));
+        pDSoundStream->offCaptureBufRead = offByteReadPos;
+        pDSoundStream->cbCaptureBuf      = bc.dwBufferBytes;
+
+        pDSoundStream->hrLastCapture     = S_OK;
+
+        DSLOG(("DSound: offCaptureBufRead=%RU32, cbCaptureBuf=%RU32\n",
+               pDSoundStream->offCaptureBufRead, pDSoundStream->cbCaptureBuf));
 
     } while (0);
@@ -1457 +1456 @@
         pDSoundStream->offPlayWritePos = 0;
         pDSoundStream->fRestartPlayback = true;
-        pDSoundStream->cMaxSamplesInBuffer = 0;
+        pDSoundStream->cbPlayBuf = 0;
 
         if (pCfgAcq)
@@ -1528 +1527 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPlay}
  */
-int drvHostDSoundStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
-{
-    RT_NOREF2(pvBuf, cbBuf);
-
+int drvHostDSoundStreamPlay(PPDMIHOSTAUDIO pInterface,
+                            PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
+{
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
+    AssertPtrReturn(pvBuf,      VERR_INVALID_POINTER);
+    AssertReturn(cbBuf,         VERR_INVALID_PARAMETER);
     /* pcbRead is optional. */
 
@@ -1540 +1540 @@
 
     int rc = VINF_SUCCESS;
-    uint32_t cReadTotal = 0;
+
+    uint32_t cbWrittenTotal = 0;
 
 #ifdef DEBUG_andy
@@ -1557 +1558 @@
          * i.e. always leave a free space for 1 audio sample.
          */
-        const DWORD cbSample = AUDIOMIXBUF_S2B(&pStream->MixBuf, 1);
+        const DWORD cbSample = PDMAUDIOPCMPROPS_S2B(&pDSoundStream->Props, 1);
         if (cbFree <= cbSample)
             break;
         cbFree     -= cbSample;
 
-        uint32_t cLive  = AudioMixBufLive(&pStream->MixBuf);
-        uint32_t cbLive = AUDIOMIXBUF_S2B(&pStream->MixBuf, cLive);
+        uint32_t cbLive = cbBuf;
 
         /* Do not write more than available space in the DirectSound playback buffer. */
@@ -1589 +1589 @@
 
         /** @todo r=bird: Can pv1/cb1 really be NULL? Docs says they're always set
-         *        and pv2/cb2 only used when there is a buffer wrap araound. */
-
-        DWORD cSamplesIn1 = AUDIOMIXBUF_B2S(&pStream->MixBuf, cb1);
+         *        and pv2/cb2 only used when there is a buffer wrap around. */
+
+        DWORD cSamplesIn1 = PDMAUDIOPCMPROPS_B2S(&pDSoundStream->Props, cb1);
         uint32_t cRead = 0;
 
         if (pv1 && cb1)
         {
-            rc = AudioMixBufReadCirc(&pStream->MixBuf, pv1, cb1, &cRead);
-            if (RT_SUCCESS(rc))
-                cReadTotal += cRead;
-        }
-
-        if (   RT_SUCCESS(rc)
-            && cReadTotal == cSamplesIn1
-            && pv2 && cb2)
-        {
-            rc = AudioMixBufReadCirc(&pStream->MixBuf, pv2, cb2, &cRead);
-            if (RT_SUCCESS(rc))
-                cReadTotal += cRead;
+            memcpy(pv1, pvBuf, cb1);
+            cbWrittenTotal += cb1;
+        }
+
+        if (pv2 && cb2)
+        {
+            memcpy(pv2, (uint8_t *)pvBuf + cb1, cb2);
+            cbWrittenTotal += cb2;
         }
 
         directSoundPlayUnlock(pThis, pDSB, pv1, pv2, cb1, cb2);
 
-        pDSoundStream->offPlayWritePos = (pDSoundStream->offPlayWritePos + AUDIOMIXBUF_S2B(&pStream->MixBuf, cReadTotal))
+        pDSoundStream->offPlayWritePos = (pDSoundStream->offPlayWritePos + PDMAUDIOPCMPROPS_S2B(&pDSoundStream->Props, cbWrittenTotal))
                                        % cbBuffer;
 
-        DSLOGF(("DSound: %RU32 (%RU32 samples) out of %RU32%s, buffer write pos %ld, rc=%Rrc\n",
-                AUDIOMIXBUF_S2B(&pStream->MixBuf, cReadTotal), cReadTotal, cbLive,
-                cbLive != AUDIOMIXBUF_S2B(&pStream->MixBuf, cReadTotal) ? " !!!": "",
+        DSLOGF(("DSound: %RU32/%RU32, buffer write pos %ld, rc=%Rrc\n",
+                PDMAUDIOPCMPROPS_S2B(&pDSoundStream->Props, cbWrittenTotal), cbLive,
                 pDSoundStream->offPlayWritePos, rc));
-
-        if (cReadTotal)
-        {
-            AudioMixBufFinish(&pStream->MixBuf, cReadTotal);
-            rc = VINF_SUCCESS; /* Played something. */
-        }
-
-        if (RT_FAILURE(rc))
-            break;
 
         if (pDSoundStream->fRestartPlayback)
@@ -1668 +1654 @@
         dsoundUpdateStatusInternal(pThis);
     else if (pcbWritten)
-        *pcbWritten = cReadTotal;
-
-    LogFlowFuncLeaveRC(rc);
+        *pcbWritten = cbWrittenTotal;
+
     return rc;
 }
@@ -1681 +1666 @@
     directSoundPlayClose(pThis, pDSoundStream);
 
-    pDSoundStream->offPlayWritePos      = 0;
-    pDSoundStream->fRestartPlayback     = true;
-    pDSoundStream->cMaxSamplesInBuffer  = 0;
+    pDSoundStream->offPlayWritePos  = 0;
+    pDSoundStream->fRestartPlayback = true;
+    pDSoundStream->cbPlayBuf        = 0;
 
     RT_ZERO(pDSoundStream->streamCfg);
@@ -1704 +1689 @@
     {
         /* Init the stream structure and save relevant information to it. */
-        pDSoundStream->idxSampleCaptureReadPos    = 0;
-        pDSoundStream->cMaxSamplesInBuffer = 0;
+        pDSoundStream->offCaptureBufRead    = 0;
+        pDSoundStream->cbPlayBuf = 0;
         pDSoundStream->pDSC                = NULL;
         pDSoundStream->pDSCB               = NULL;
@@ -1781 +1766 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
  */
-int drvHostDSoundStreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
-{
-    RT_NOREF2(pvBuf, cbBuf);
+int drvHostDSoundStreamCapture(PPDMIHOSTAUDIO pInterface,
+                               PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
+{
+
+    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
+    AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
+    AssertPtrReturn(pvBuf,      VERR_INVALID_POINTER);
+    AssertReturn(cbBuf,         VERR_INVALID_PARAMETER);
 
     PDRVHOSTDSOUND pThis = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
@@ -1792 +1782 @@
     int rc = VINF_SUCCESS;
 
-    uint32_t cSamplesProcessed = 0;
+    uint32_t cbReadTotal = 0;
 
     do
@@ -1803 +1793 @@
 
         /* Get DirectSound capture position in bytes. */
-        DWORD offByteReadPos;
-        HRESULT hr = IDirectSoundCaptureBuffer_GetCurrentPosition(pDSCB, NULL, &offByteReadPos);
+        DWORD offCurPos;
+        HRESULT hr = IDirectSoundCaptureBuffer_GetCurrentPosition(pDSCB, NULL, &offCurPos);
         if (FAILED(hr))
         {
@@ -1819 +1809 @@
         pDSoundStream->hrLastCapture = hr;
 
-        if (offByteReadPos & pDSoundStream->Props.uAlign)
-            DSLOGF(("DSound: Misaligned capture read position %ld (alignment: %RU32)\n", offByteReadPos, pDSoundStream->Props.uAlign));
-
-        /* Capture position in samples. */
-        DWORD idxSampleReadPos = offByteReadPos >> pDSoundStream->Props.cShift;
+        if (offCurPos & pDSoundStream->Props.uAlign)
+            DSLOGF(("DSound: Misaligned capture read position %ld (alignment: %RU32)\n", offCurPos, pDSoundStream->Props.uAlign));
 
         /* Number of samples available in the DirectSound capture buffer. */
-        DWORD cSamplesToCapture = dsoundRingDistance(idxSampleReadPos, pDSoundStream->idxSampleCaptureReadPos,
-                                                     pDSoundStream->cMaxSamplesInBuffer);
-        if (cSamplesToCapture == 0)
-            break;
-
-        /* Get number of free samples in the mix buffer and check that is has free space */
-        uint32_t cFreeMixSamples = AudioMixBufFree(&pStream->MixBuf);
-        if (cFreeMixSamples == 0)
+        DWORD cbToCapture = dsoundRingDistance(offCurPos, pDSoundStream->offCaptureBufRead, pDSoundStream->cbCaptureBuf);
+        if (cbToCapture == 0)
+            break;
+
+        if (cbBuf == 0)
         {
             DSLOGF(("DSound: Capture buffer full\n"));
@@ -1839 +1823 @@
         }
 
-        DSLOGF(("DSound: Capture cFreeMixSamples=%RU32, idxSampleReadPos=%u, idxSampleCaptureReadPos=%u, cSamplesToCapture=%u\n",
-                cFreeMixSamples, idxSampleReadPos, pDSoundStream->idxSampleCaptureReadPos, cSamplesToCapture));
+        DSLOGF(("DSound: Capture cbBuf=%RU32, offCurPos=%ld, offCaptureBufRead=%ld, cbToCapture=%ld\n",
+                cbBuf, offCurPos, pDSoundStream->offCaptureBufRead, cbToCapture));
 
         /* No need to fetch more samples than mix buffer can receive. */
-        cSamplesToCapture = RT_MIN(cSamplesToCapture, cFreeMixSamples);
+        cbToCapture = RT_MIN(cbToCapture, cbBuf);
 
         /* Lock relevant range in the DirectSound capture buffer. */
@@ -1849 +1833 @@
         DWORD cb1, cb2;
         hr = directSoundCaptureLock(pDSCB, &pDSoundStream->Props,
-                                    AUDIOMIXBUF_S2B(&pStream->MixBuf, pDSoundStream->idxSampleCaptureReadPos), /* dwOffset */
-                                    AUDIOMIXBUF_S2B(&pStream->MixBuf, cSamplesToCapture),                      /* dwBytes */
+                                    pDSoundStream->offCaptureBufRead, /* dwOffset */
+                                    cbToCapture,                      /* dwBytes */
                                     &pv1, &pv2, &cb1, &cb2,
-                                    0 /* dwFlags */);
+                                    0                                 /* dwFlags */);
         if (FAILED(hr))
         {
@@ -1859 +1843 @@
         }
 
-        DWORD len1 = AUDIOMIXBUF_B2S(&pStream->MixBuf, cb1);
-        DWORD len2 = AUDIOMIXBUF_B2S(&pStream->MixBuf, cb2);
-
-        uint32_t cSamplesWrittenTotal = 0;
-        uint32_t cSamplesWritten;
-        if (pv1 && len1)
-        {
-            rc = AudioMixBufWriteCirc(&pStream->MixBuf, pv1, cb1, &cSamplesWritten);
-            if (RT_SUCCESS(rc))
-                cSamplesWrittenTotal += cSamplesWritten;
-        }
-
-        if (   RT_SUCCESS(rc)
-            && cSamplesWrittenTotal == len1
-            && pv2 && len2)
-        {
-            rc = AudioMixBufWriteCirc(&pStream->MixBuf, pv2, cb2, &cSamplesWritten);
-            if (RT_SUCCESS(rc))
-                cSamplesWrittenTotal += cSamplesWritten;
+        if (pv1 && cb1)
+        {
+            memcpy((uint8_t *)pvBuf + cbReadTotal, pv1, cb1);
+            cbReadTotal += cb1;
+        }
+
+        if (pv2 && cb2)
+        {
+            memcpy((uint8_t *)pvBuf + cbReadTotal, pv2, cb2);
+            cbReadTotal += cb2;
         }
 
         directSoundCaptureUnlock(pDSCB, pv1, pv2, cb1, cb2);
 
-        if (cSamplesWrittenTotal) /* Captured something? */
-            rc = AudioMixBufMixToParent(&pStream->MixBuf, cSamplesWrittenTotal, &cSamplesProcessed);
-
         if (RT_SUCCESS(rc))
         {
-            pDSoundStream->idxSampleCaptureReadPos = (pDSoundStream->idxSampleCaptureReadPos + cSamplesProcessed)
-                                                   % pDSoundStream->cMaxSamplesInBuffer;
-            DSLOGF(("DSound: Capture %u (%u+%u), processed %RU32/%RU32\n",
-                    cSamplesToCapture, len1, len2, cSamplesProcessed, cSamplesWrittenTotal));
+            pDSoundStream->offCaptureBufRead = (pDSoundStream->offCaptureBufRead + cbReadTotal)
+                                             % pDSoundStream->cbCaptureBuf;
+            DSLOGF(("DSound: Captured %ld bytes (%RU32 total)\n", cbToCapture, cbReadTotal));
         }
 
     } while (0);
 
-    if (RT_FAILURE(rc))
+    if (RT_SUCCESS(rc))
+    {
+        if (pcbRead)
+            *pcbRead = cbReadTotal;
+    }
+    else
         dsoundUpdateStatusInternal(pThis);
-    else if (pcbRead)
-        *pcbRead = cSamplesProcessed;
-
-    LogFlowFuncLeaveRC(rc);
+
     return rc;
 }
@@ -1910 +1883 @@
     directSoundCaptureClose(pDSoundStream);
 
-    pDSoundStream->idxSampleCaptureReadPos = 0;
-    pDSoundStream->cMaxSamplesInBuffer = 0;
+    pDSoundStream->offCaptureBufRead = 0;
+    pDSoundStream->cbCaptureBuf      = 0;
+
     RT_ZERO(pDSoundStream->streamCfg);
 

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2016 Oracle Corporation
+ * Copyright (C) 2016-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -26 +26 @@
 
 #include "DrvAudio.h"
-#include "AudioMixBuffer.h"
 #include "VBoxDD.h"
 
@@ -50 +49 @@
             /** Timestamp of last played samples. */
             uint64_t   tsLastPlayed;
-            uint64_t   cMaxSamplesInPlayBuffer;
             uint8_t   *pu8PlayBuffer;
+            size_t     cbPlayBuffer;
         } Out;
     };
+    PDMAUDIOPCMPROPS   Props;
 
 } DEBUGAUDIOSTREAM, *PDEBUGAUDIOSTREAM;
@@ -128 +128 @@
     RT_NOREF(pInterface, pStream);
 
+    PDEBUGAUDIOSTREAM pDbgStream = (PDEBUGAUDIOSTREAM)pStream;
+
     /* Just adopt the wanted stream configuration. */
-    PDMAUDIOPCMPROPS Props;
-    int rc = DrvAudioHlpStreamCfgToProps(pCfgReq, &Props);
+    int rc = DrvAudioHlpStreamCfgToProps(pCfgReq, &pDbgStream->Props);
     if (RT_SUCCESS(rc))
     {
@@ -145 +146 @@
                                 PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
-    NOREF(pInterface);
+    RT_NOREF(pInterface);
 
     PDEBUGAUDIOSTREAM pDbgStream = (PDEBUGAUDIOSTREAM)pStream;
 
     /* Just adopt the wanted stream configuration. */
-    PDMAUDIOPCMPROPS Props;
-    int rc = DrvAudioHlpStreamCfgToProps(pCfgReq, &Props);
+    int rc = DrvAudioHlpStreamCfgToProps(pCfgReq, &pDbgStream->Props);
     if (RT_SUCCESS(rc))
     {
-        pDbgStream->Out.tsLastPlayed            = 0;
-        pDbgStream->Out.cMaxSamplesInPlayBuffer = _1K;
-        pDbgStream->Out.pu8PlayBuffer           = (uint8_t *)RTMemAlloc(pDbgStream->Out.cMaxSamplesInPlayBuffer << Props.cShift);
+        pDbgStream->Out.tsLastPlayed  = 0;
+        pDbgStream->Out.cbPlayBuffer  = _1K * PDMAUDIOPCMPROPS_S2B(&pDbgStream->Props, 1); /** @todo Make this configurable? */
+        pDbgStream->Out.pu8PlayBuffer = (uint8_t *)RTMemAlloc(pDbgStream->Out.cbPlayBuffer);
         if (!pDbgStream->Out.pu8PlayBuffer)
             rc = VERR_NO_MEMORY;
@@ -174 +174 @@
                 rc = DrvAudioHlpWAVFileOpen(&pDbgStream->File, szFile,
                                             RTFILE_O_WRITE | RTFILE_O_DENY_WRITE | RTFILE_O_CREATE_REPLACE,
-                                            &Props, PDMAUDIOFILEFLAG_NONE);
+                                            &pDbgStream->Props, PDMAUDIOFILEFLAG_NONE);
                 if (RT_FAILURE(rc))
                     LogRel(("DebugAudio: Creating output file '%s' failed with %Rrc\n", szFile, rc));
@@ -188 +188 @@
     {
         if (pCfgAcq)
-            pCfgAcq->cSampleBufferSize = pDbgStream->Out.cMaxSamplesInPlayBuffer;
+            pCfgAcq->cSampleBufferSize = PDMAUDIOPCMPROPS_B2S(&pDbgStream->Props, pDbgStream->Out.cbPlayBuffer);
     }
 
@@ -247 +247 @@
         cSamplesPlayed = cLive;*/
 
-    uint32_t cSamplesPlayed = 0;
-    uint32_t cSamplesAvail  = RT_MIN(AudioMixBufUsed(&pStream->MixBuf), pDbgStream->Out.cMaxSamplesInPlayBuffer);
-    while (cSamplesAvail)
-    {
-        uint32_t cSamplesRead = 0;
-        int rc2 = AudioMixBufReadCirc(&pStream->MixBuf, pDbgStream->Out.pu8PlayBuffer,
-                                      AUDIOMIXBUF_S2B(&pStream->MixBuf, cSamplesAvail), &cSamplesRead);
-
-        if (RT_FAILURE(rc2))
-            LogRel(("DebugAudio: Reading output failed with %Rrc\n", rc2));
-
-        if (!cSamplesRead)
-            break;
+    uint32_t cbWritten = 0;
+
+    uint32_t cbAvail  = RT_MIN(cbBuf, pDbgStream->Out.cbPlayBuffer);
+    while (cbAvail)
+    {
+        uint32_t cbChunk = cbAvail; /** @todo Use chunks? */
+
+        memcpy(pDbgStream->Out.pu8PlayBuffer, pvBuf, cbChunk);
 #if 0
         RTFILE fh;
         RTFileOpen(&fh, "/tmp/AudioDebug-Output.pcm",
                    RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
-        RTFileWrite(fh, pDbgStream->Out.pu8PlayBuffer, AUDIOMIXBUF_S2B(&pStream->MixBuf, cSamplesRead), NULL);
+        RTFileWrite(fh, pDbgStream->Out.pu8PlayBuffer, cbChunk, NULL);
         RTFileClose(fh);
 #endif
-        rc2 = DrvAudioHlpWAVFileWrite(&pDbgStream->File,
-                                      pDbgStream->Out.pu8PlayBuffer, AUDIOMIXBUF_S2B(&pStream->MixBuf, cSamplesRead),
-                                      0 /* fFlags */);
+        int rc2 = DrvAudioHlpWAVFileWrite(&pDbgStream->File,
+                                          pDbgStream->Out.pu8PlayBuffer, cbChunk, 0 /* fFlags */);
         if (RT_FAILURE(rc2))
+        {
             LogRel(("DebugAudio: Writing output failed with %Rrc\n", rc2));
-
-        AudioMixBufFinish(&pStream->MixBuf, cSamplesRead);
-
-        Assert(cSamplesAvail >= cSamplesRead);
-        cSamplesAvail -= cSamplesRead;
-
-        cSamplesPlayed += cSamplesRead;
+            break;
+        }
+
+        Assert(cbAvail >= cbAvail);
+        cbAvail   -= cbChunk;
+
+        cbWritten += cbChunk;
     }
 
@@ -285 +280 @@
 
     if (pcbWritten)
-        *pcbWritten = cSamplesPlayed;
+        *pcbWritten = cbWritten;
 
     return VINF_SUCCESS;

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -54 +54 @@
 
 #include "DrvAudio.h"
-#include "AudioMixBuffer.h"
 #include "VBoxDD.h"
 
@@ -68 +67 @@
     PDMAUDIOPCMPROPS    Props;
     uint64_t            u64TicksLast;
-    uint64_t            cMaxSamplesInPlayBuffer;
-    uint8_t            *pbPlayBuffer;
 } NULLAUDIOSTREAMOUT;
 typedef NULLAUDIOSTREAMOUT *PNULLAUDIOSTREAMOUT;
@@ -150 +147 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPlay}
  */
-static DECLCALLBACK(int) drvHostNullAudioStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
+static DECLCALLBACK(int) drvHostNullAudioStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream,
+                                                    const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
-
-    RT_NOREF2(pvBuf, cbBuf);
+    AssertPtrReturn(pvBuf,      VERR_INVALID_POINTER);
+    AssertReturn(cbBuf,         VERR_INVALID_PARAMETER);
 
     PDRVHOSTNULLAUDIO   pDrv        = RT_FROM_MEMBER(pInterface, DRVHOSTNULLAUDIO, IHostAudio);
@@ -161 +159 @@
 
     /* Consume as many samples as would be played at the current frequency since last call. */
-    uint32_t cLive           = AudioMixBufLive(&pStream->MixBuf);
+    uint32_t csLive          = PDMAUDIOPCMPROPS_B2S(&pNullStream->Props, cbBuf);
 
     uint64_t u64TicksNow     = PDMDrvHlpTMGetVirtualTime(pDrv->pDrvIns);
@@ -174 +172 @@
      * If rounding is not taken into account then the playback rate will be consistently lower that expected.
      */
-    uint64_t cSamplesPlayed = (2 * u64TicksElapsed * pNullStream->Props.uHz + u64TicksFreq) / u64TicksFreq / 2;
+    uint64_t csPlayed = (2 * u64TicksElapsed * pNullStream->Props.uHz + u64TicksFreq) / u64TicksFreq / 2;
 
     /* Don't play more than available. */
-    if (cSamplesPlayed > cLive)
-        cSamplesPlayed = cLive;
-
-    cSamplesPlayed = RT_MIN(cSamplesPlayed, pNullStream->cMaxSamplesInPlayBuffer);
-
-    uint32_t cSamplesToRead = 0;
-    AudioMixBufReadCirc(&pStream->MixBuf, pNullStream->pbPlayBuffer,
-                        AUDIOMIXBUF_S2B(&pStream->MixBuf, cSamplesPlayed), &cSamplesToRead);
-    AudioMixBufFinish(&pStream->MixBuf, cSamplesToRead);
+    if (csPlayed > csLive)
+        csPlayed = csLive;
+
+    /* Note: No copying of samples needed here, as this a NULL backend. */
 
     if (pcbWritten)
-        *pcbWritten = cSamplesToRead;
+        *pcbWritten = PDMAUDIOPCMPROPS_S2B(&pNullStream->Props, csPlayed);
 
     return VINF_SUCCESS;
@@ -197 +190 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
  */
-static DECLCALLBACK(int) drvHostNullAudioStreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
-{
-    RT_NOREF4(pInterface, pStream, pvBuf, cbBuf);
-
-    /* Never capture anything. */
+static DECLCALLBACK(int) drvHostNullAudioStreamCapture(PPDMIHOSTAUDIO pInterface,
+                                                       PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
+{
+    RT_NOREF(pInterface, pStream);
+
+    RT_BZERO(pvBuf, cbBuf);
+
+    /* Return silent audio. */
     if (pcbRead)
-        *pcbRead = 0;
+        *pcbRead = cbBuf;
 
     return VINF_SUCCESS;
@@ -221 +217 @@
     }
 
-    LogFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -235 +230 @@
     {
         pNullStream->u64TicksLast  = 0;
-        pNullStream->cMaxSamplesInPlayBuffer = _1K;
-
-        pNullStream->pbPlayBuffer = (uint8_t *)RTMemAlloc(_1K << pNullStream->Props.cShift);
-        if (pNullStream->pbPlayBuffer)
-        {
-            if (pCfgAcq)
-                pCfgAcq->cSampleBufferSize = pNullStream->cMaxSamplesInPlayBuffer;
-        }
-        else
-            rc = VERR_NO_MEMORY;
+
+        if (pCfgAcq)
+            pCfgAcq->cSampleBufferSize = _1K; /** @todo Make this configurable. */
     }
 
-    LogFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -255 +242 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
  */
-static DECLCALLBACK(int) drvHostNullAudioStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+static DECLCALLBACK(int) drvHostNullAudioStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream,
+                                                      PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
@@ -281 +269 @@
 static int nullDestroyStreamOut(PPDMAUDIOSTREAM pStream)
 {
-    PNULLAUDIOSTREAMOUT pNullStream = RT_FROM_MEMBER(pStream, NULLAUDIOSTREAMOUT, Stream);
-    if (   pNullStream
-        && pNullStream->pbPlayBuffer)
-    {
-        RTMemFree(pNullStream->pbPlayBuffer);
-        pNullStream->pbPlayBuffer = NULL;
-    }
-
-    LogFlowFuncLeaveRC(VINF_SUCCESS);
+    RT_NOREF(pStream);
     return VINF_SUCCESS;
 }

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2014-2016 Oracle Corporation
+ * Copyright (C) 2014-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -31 +31 @@
 
 #include "DrvAudio.h"
-#include "AudioMixBuffer.h"
-
 #include "VBoxDD.h"
 
@@ -373 +371 @@
         {
             DrvAudioHlpClearBuf(&pStreamOut->Props, pStreamOut->pvBuf, pStreamOut->cbBuf,
-                                AUDIOMIXBUF_B2S(&pStream->MixBuf, pStreamOut->cbBuf));
+                                PDMAUDIOPCMPROPS_B2S(&pStreamOut->Props, pStreamOut->cbBuf));
 
             int mask = PCM_ENABLE_OUTPUT;
@@ -431 +429 @@
     AssertPtrReturn(pStream, VERR_INVALID_POINTER);
 
-    POSSAUDIOSTREAMIN pStrm = (POSSAUDIOSTREAMIN)pStream;
+    POSSAUDIOSTREAMIN pStreamOSS = (POSSAUDIOSTREAMIN)pStream;
 
     int rc = VINF_SUCCESS;
-    size_t cbToRead = RT_MIN(pStrm->cbBuf,
-                             AudioMixBufFreeBytes(&pStream->MixBuf));
-
-    LogFlowFunc(("cbToRead=%zu\n", cbToRead));
-
-    uint32_t cWrittenTotal = 0;
+
+    size_t cbToRead = RT_MIN(pStreamOSS->cbBuf, cbBuf);
+
+    LogFlowFunc(("cbToRead=%zi\n", cbToRead));
+
+    uint32_t cbReadTotal = 0;
     uint32_t cbTemp;
     ssize_t  cbRead;
@@ -446 +444 @@
     while (cbToRead)
     {
-        cbTemp = RT_MIN(cbToRead, pStrm->cbBuf);
+        cbTemp = RT_MIN(cbToRead, pStreamOSS->cbBuf);
         AssertBreakStmt(cbTemp, rc = VERR_NO_DATA);
-        cbRead = read(pStrm->hFile, (uint8_t *)pStrm->pvBuf + offWrite, cbTemp);
+        cbRead = read(pStreamOSS->hFile, (uint8_t *)pStreamOSS->pvBuf, cbTemp);
 
         LogFlowFunc(("cbRead=%zi, cbTemp=%RU32, cbToRead=%zu\n", cbRead, cbTemp, cbToRead));
@@ -479 +477 @@
         else if (cbRead)
         {
-            uint32_t cWritten;
-            rc = AudioMixBufWriteCirc(&pStream->MixBuf, pStrm->pvBuf, cbRead, &cWritten);
-            if (RT_FAILURE(rc))
-                break;
-
-            uint32_t cbWritten = AUDIOMIXBUF_S2B(&pStream->MixBuf, cWritten);
-
-            Assert(cbToRead >= cbWritten);
-            cbToRead      -= cbWritten;
-            offWrite      += cbWritten;
-            cWrittenTotal += cWritten;
+            memcpy((uint8_t *)pvBuf + offWrite, pStreamOSS->pvBuf, cbRead);
+
+            Assert((ssize_t)cbToRead >= cbRead);
+            cbToRead    -= cbRead;
+            offWrite    += cbRead;
+            cbReadTotal += cbRead;
         }
         else /* No more data, try next round. */
@@ -500 +493 @@
     if (RT_SUCCESS(rc))
     {
-        uint32_t cProcessed = 0;
-        if (cWrittenTotal)
-            rc = AudioMixBufMixToParent(&pStream->MixBuf, cWrittenTotal, &cProcessed);
-
         if (pcbRead)
-            *pcbRead = cWrittenTotal;
-
-        LogFlowFunc(("cWrittenTotal=%RU32 (%RU32 processed), rc=%Rrc\n",
-                     cWrittenTotal, cProcessed, rc));
-    }
-
-    LogFlowFuncLeaveRC(rc);
+            *pcbRead = cbReadTotal;
+    }
+
     return rc;
 }
@@ -859 +844 @@
     AssertPtrReturn(pStream, VERR_INVALID_POINTER);
 
-    POSSAUDIOSTREAMOUT pStrm = (POSSAUDIOSTREAMOUT)pStream;
+    POSSAUDIOSTREAMOUT pStreamOSS = (POSSAUDIOSTREAMOUT)pStream;
 
     int rc = VINF_SUCCESS;
@@ -870 +855 @@
     do
     {
-        size_t cbBufSize = AudioMixBufSizeBytes(&pStream->MixBuf);
-
-        uint32_t csLive = AudioMixBufLive(&pStream->MixBuf);
-        uint32_t csToRead;
+        uint32_t cbAvail = PDMAUDIOPCMPROPS_S2B(&pStreamOSS->Props, cbBuf);
+        uint32_t cbToRead;
 
 #ifndef RT_OS_L4
-        if (pStrm->fMMIO)
+        if (pStreamOSS->fMMIO)
         {
             /* Get current playback pointer. */
-            int rc2 = ioctl(pStrm->hFile, SNDCTL_DSP_GETOPTR, &cntinfo);
+            int rc2 = ioctl(pStreamOSS->hFile, SNDCTL_DSP_GETOPTR, &cntinfo);
             if (!rc2)
             {
@@ -888 +871 @@
 
             /* Nothing to play? */
-            if (cntinfo.ptr == pStrm->old_optr)
+            if (cntinfo.ptr == pStreamOSS->old_optr)
                 break;
 
             int cbData;
-            if (cntinfo.ptr > pStrm->old_optr)
-                cbData = cntinfo.ptr - pStrm->old_optr;
+            if (cntinfo.ptr > pStreamOSS->old_optr)
+                cbData = cntinfo.ptr - pStreamOSS->old_optr;
             else
-                cbData = cbBufSize + cntinfo.ptr - pStrm->old_optr;
-            Assert(cbData);
-
-            csToRead = RT_MIN((uint32_t)AUDIOMIXBUF_B2S(&pStream->MixBuf, cbData),
-                             csLive);
+                cbData = cbBuf + cntinfo.ptr - pStreamOSS->old_optr;
+            Assert(cbData >= 0);
+
+            cbToRead = RT_MIN((unsigned)cbData, cbAvail);
         }
         else
@@ -905 +887 @@
 #endif
             audio_buf_info abinfo;
-            int rc2 = ioctl(pStrm->hFile, SNDCTL_DSP_GETOSPACE, &abinfo);
+            int rc2 = ioctl(pStreamOSS->hFile, SNDCTL_DSP_GETOSPACE, &abinfo);
             if (rc2 < 0)
             {
@@ -913 +895 @@
             }
 
-            if ((size_t)abinfo.bytes > cbBufSize)
-            {
-                LogRel2(("OSS: Warning: Too big output size (%d > %zu), limiting to %zu\n", abinfo.bytes, cbBufSize, cbBufSize));
-                abinfo.bytes = cbBufSize;
+            if ((size_t)abinfo.bytes > cbBuf)
+            {
+                LogRel2(("OSS: Warning: Too big output size (%d > %RU32), limiting to %RU32\n", abinfo.bytes, cbBuf, cbBuf));
+                abinfo.bytes = cbBuf;
                 /* Keep going. */
             }
@@ -922 +904 @@
             if (abinfo.bytes < 0)
             {
-                LogRel2(("OSS: Warning: Invalid available size (%d vs. %zu)\n", abinfo.bytes, cbBufSize));
+                LogRel2(("OSS: Warning: Invalid available size (%d vs. %RU32)\n", abinfo.bytes, cbBuf));
                 rc = VERR_INVALID_PARAMETER;
                 break;
             }
 
-            csToRead = RT_MIN((uint32_t)AUDIOMIXBUF_B2S(&pStream->MixBuf, abinfo.fragments * abinfo.fragsize), csLive);
-            if (!csToRead)
-                break;
+            cbToRead = RT_MIN(unsigned(abinfo.fragments * abinfo.fragsize), cbAvail);
 #ifndef RT_OS_L4
         }
 #endif
-        size_t cbToRead = RT_MIN(AUDIOMIXBUF_S2B(&pStream->MixBuf, csToRead), pStrm->cbBuf);
-
-        uint32_t csRead, cbRead;
         while (cbToRead)
         {
-            rc = AudioMixBufReadCirc(&pStream->MixBuf, pStrm->pvBuf, cbToRead, &csRead);
-            if (RT_FAILURE(rc))
-                break;
-
-            cbRead = AUDIOMIXBUF_S2B(&pStream->MixBuf, csRead);
+            uint32_t cbRead     = cbToRead;
+
+            memcpy(pStreamOSS->pvBuf, pvBuf, cbRead);
 
             uint32_t cbChunk    = cbRead;
@@ -948 +923 @@
             while (cbChunk)
             {
-                ssize_t cbChunkWritten = write(pStrm->hFile, (uint8_t *)pStrm->pvBuf + cbChunkOff,
+                ssize_t cbChunkWritten = write(pStreamOSS->hFile, (uint8_t *)pStreamOSS->pvBuf + cbChunkOff,
                                                RT_MIN(cbChunk, (unsigned)s_OSSConf.fragsize));
                 if (cbChunkWritten < 0)
@@ -957 +932 @@
                 }
 
-                if (cbChunkWritten & pStrm->Props.uAlign)
+                if (cbChunkWritten & pStreamOSS->Props.uAlign)
                 {
                     LogRel(("OSS: Misaligned write (written %z, expected %RU32)\n", cbChunkWritten, cbChunk));
@@ -976 +951 @@
 #ifndef RT_OS_L4
         /* Update read pointer. */
-        if (pStrm->fMMIO)
-            pStrm->old_optr = cntinfo.ptr;
+        if (pStreamOSS->fMMIO)
+            pStreamOSS->old_optr = cntinfo.ptr;
 #endif
 
@@ -984 +959 @@
     if (RT_SUCCESS(rc))
     {
-        uint32_t cWrittenTotal = AUDIOMIXBUF_B2S(&pStream->MixBuf, cbWrittenTotal);
-        if (cWrittenTotal)
-            AudioMixBufFinish(&pStream->MixBuf, cWrittenTotal);
-
         if (pcbWritten)
             *pcbWritten = cbWrittenTotal;
     }
 
-    LogFlowFuncLeaveRC(rc);
     return rc;
 }

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -38 +38 @@
 
 #include "DrvAudio.h"
-#include "AudioMixBuffer.h"
-
 #include "VBoxDD.h"
 
@@ -101 +99 @@
      *  Note: Always must come first! */
     PDMAUDIOSTREAM         Stream;
+    PDMAUDIOPCMPROPS       Props;
     /** Pointer to driver instance. */
     PDRVHOSTPULSEAUDIO     pDrv;
-    /** DAC/ADC buffer. */
-    void                  *pvPCMBuf;
-    /** Size (in bytes) of DAC/ADC buffer. */
-    uint32_t               cbPCMBuf;
     /** Pointer to opaque PulseAudio stream. */
     pa_stream             *pPAStream;
@@ -657 +652 @@
                              PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
-    PDRVHOSTPULSEAUDIO pThis = PDMIHOSTAUDIO_2_DRVHOSTPULSEAUDIO(pInterface);
-    PPULSEAUDIOSTREAM  pStrm = (PPULSEAUDIOSTREAM)pStream;
+    PDRVHOSTPULSEAUDIO pThis     = PDMIHOSTAUDIO_2_DRVHOSTPULSEAUDIO(pInterface);
+    PPULSEAUDIOSTREAM  pStreamPA = (PPULSEAUDIOSTREAM)pStream;
 
     LogFlowFuncEnter();
 
-    pStrm->pDrainOp            = NULL;
-
-    pStrm->SampleSpec.format   = paFmtToPulse(pCfgReq->enmFormat);
-    pStrm->SampleSpec.rate     = pCfgReq->uHz;
-    pStrm->SampleSpec.channels = pCfgReq->cChannels;
+    pStreamPA->pDrainOp            = NULL;
+
+    pStreamPA->SampleSpec.format   = paFmtToPulse(pCfgReq->enmFormat);
+    pStreamPA->SampleSpec.rate     = pCfgReq->uHz;
+    pStreamPA->SampleSpec.channels = pCfgReq->cChannels;
 
     /* Note that setting maxlength to -1 does not work on PulseAudio servers
      * older than 0.9.10. So use the suggested value of 3/2 of tlength */
-    pStrm->BufAttr.tlength     =   (pa_bytes_per_second(&pStrm->SampleSpec)
+    pStreamPA->BufAttr.tlength     =   (pa_bytes_per_second(&pStreamPA->SampleSpec)
                                         * s_pulseCfg.buffer_msecs_out) / 1000;
-    pStrm->BufAttr.maxlength   = (pStrm->BufAttr.tlength * 3) / 2;
-    pStrm->BufAttr.prebuf      = -1; /* Same as tlength */
-    pStrm->BufAttr.minreq      = -1;
+    pStreamPA->BufAttr.maxlength   = (pStreamPA->BufAttr.tlength * 3) / 2;
+    pStreamPA->BufAttr.prebuf      = -1; /* Same as tlength */
+    pStreamPA->BufAttr.minreq      = -1;
 
     /* Note that the struct BufAttr is updated to the obtained values after this call! */
-    int rc = paStreamOpen(pThis, false /* fIn */, "PulseAudio (Out)", &pStrm->SampleSpec, &pStrm->BufAttr, &pStrm->pPAStream);
+    int rc = paStreamOpen(pThis, false /* fIn */, "PulseAudio (Out)", &pStreamPA->SampleSpec, &pStreamPA->BufAttr, &pStreamPA->pPAStream);
     if (RT_FAILURE(rc))
         return rc;
 
-    rc = paPulseToFmt(pStrm->SampleSpec.format,
+    rc = paPulseToFmt(pStreamPA->SampleSpec.format,
                       &pCfgAcq->enmFormat, &pCfgAcq->enmEndianness);
     if (RT_FAILURE(rc))
     {
-        LogRel(("PulseAudio: Cannot find audio output format %ld\n", pStrm->SampleSpec.format));
+        LogRel(("PulseAudio: Cannot find audio output format %ld\n", pStreamPA->SampleSpec.format));
         return rc;
     }
 
-    pCfgAcq->uHz       = pStrm->SampleSpec.rate;
-    pCfgAcq->cChannels = pStrm->SampleSpec.channels;
-
-    PDMAUDIOPCMPROPS Props;
-    rc = DrvAudioHlpStreamCfgToProps(pCfgAcq, &Props);
+    pCfgAcq->uHz       = pStreamPA->SampleSpec.rate;
+    pCfgAcq->cChannels = pStreamPA->SampleSpec.channels;
+
+    rc = DrvAudioHlpStreamCfgToProps(pCfgAcq, &pStreamPA->Props);
     if (RT_SUCCESS(rc))
     {
-        uint32_t cbBuf  = RT_MIN(pStrm->BufAttr.tlength * 2,
-                                 pStrm->BufAttr.maxlength); /** @todo Make this configurable! */
+        uint32_t cbBuf  = RT_MIN(pStreamPA->BufAttr.tlength * 2,
+                                 pStreamPA->BufAttr.maxlength); /** @todo Make this configurable! */
         if (cbBuf)
         {
-            pStrm->pvPCMBuf = RTMemAllocZ(cbBuf);
-            if (pStrm->pvPCMBuf)
-            {
-                pStrm->cbPCMBuf = cbBuf;
-                pStrm->pDrv     = pThis;
-
-                pCfgAcq->cSampleBufferSize = cbBuf >> Props.cShift;
-            }
-            else
-                rc = VERR_NO_MEMORY;
+            pStreamPA->pDrv     = pThis;
+
+            pCfgAcq->cSampleBufferSize = PDMAUDIOPCMPROPS_B2S(&pStreamPA->Props, cbBuf);
         }
         else
@@ -723 +710 @@
                             PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
-    PDRVHOSTPULSEAUDIO pThis   = PDMIHOSTAUDIO_2_DRVHOSTPULSEAUDIO(pInterface);
-    PPULSEAUDIOSTREAM  pPAStrm = (PPULSEAUDIOSTREAM)pStream;
-
-    pPAStrm->SampleSpec.format   = paFmtToPulse(pCfgReq->enmFormat);
-    pPAStrm->SampleSpec.rate     = pCfgReq->uHz;
-    pPAStrm->SampleSpec.channels = pCfgReq->cChannels;
+    PDRVHOSTPULSEAUDIO pThis     = PDMIHOSTAUDIO_2_DRVHOSTPULSEAUDIO(pInterface);
+    PPULSEAUDIOSTREAM  pStreamPA = (PPULSEAUDIOSTREAM)pStream;
+
+    pStreamPA->SampleSpec.format   = paFmtToPulse(pCfgReq->enmFormat);
+    pStreamPA->SampleSpec.rate     = pCfgReq->uHz;
+    pStreamPA->SampleSpec.channels = pCfgReq->cChannels;
 
     /** @todo Check these values! */
-    pPAStrm->BufAttr.fragsize    = (pa_bytes_per_second(&pPAStrm->SampleSpec) * s_pulseCfg.buffer_msecs_in) / 1000;
-    pPAStrm->BufAttr.maxlength   = (pPAStrm->BufAttr.fragsize * 3) / 2;
+    pStreamPA->BufAttr.fragsize    = (pa_bytes_per_second(&pStreamPA->SampleSpec) * s_pulseCfg.buffer_msecs_in) / 1000;
+    pStreamPA->BufAttr.maxlength   = (pStreamPA->BufAttr.fragsize * 3) / 2;
 
     /* Note: Other members of BufAttr are ignored for record streams. */
-    int rc = paStreamOpen(pThis, true /* fIn */, "PulseAudio (In)", &pPAStrm->SampleSpec, &pPAStrm->BufAttr,
-                          &pPAStrm->pPAStream);
+    int rc = paStreamOpen(pThis, true /* fIn */, "PulseAudio (In)", &pStreamPA->SampleSpec, &pStreamPA->BufAttr,
+                          &pStreamPA->pPAStream);
     if (RT_FAILURE(rc))
         return rc;
 
-    rc = paPulseToFmt(pPAStrm->SampleSpec.format, &pCfgAcq->enmFormat,
-                      &pCfgAcq->enmEndianness);
+    rc = paPulseToFmt(pStreamPA->SampleSpec.format, &pCfgAcq->enmFormat, &pCfgAcq->enmEndianness);
     if (RT_FAILURE(rc))
     {
-        LogRel(("PulseAudio: Cannot find audio capture format %ld\n", pPAStrm->SampleSpec.format));
+        LogRel(("PulseAudio: Cannot find audio capture format %ld\n", pStreamPA->SampleSpec.format));
         return rc;
     }
 
-    PDMAUDIOPCMPROPS Props;
-    rc = DrvAudioHlpStreamCfgToProps(pCfgAcq, &Props);
+    rc = DrvAudioHlpStreamCfgToProps(pCfgAcq, &pStreamPA->Props);
     if (RT_SUCCESS(rc))
     {
-        pPAStrm->pDrv       = pThis;
-        pPAStrm->pu8PeekBuf = NULL;
-
-        pCfgAcq->uHz               = pPAStrm->SampleSpec.rate;
-        pCfgAcq->cChannels         = pPAStrm->SampleSpec.channels;
-        pCfgAcq->cSampleBufferSize = RT_MIN(pPAStrm->BufAttr.fragsize * 10, pPAStrm->BufAttr.maxlength) >> Props.cShift;
+        pStreamPA->pDrv       = pThis;
+        pStreamPA->pu8PeekBuf = NULL;
+
+        pCfgAcq->uHz               = pStreamPA->SampleSpec.rate;
+        pCfgAcq->cChannels         = pStreamPA->SampleSpec.channels;
+        pCfgAcq->cSampleBufferSize = PDMAUDIOPCMPROPS_B2S(&pStreamPA->Props,
+                                                          RT_MIN(pStreamPA->BufAttr.fragsize * 10, pStreamPA->BufAttr.maxlength));
     }
 
@@ -774 +760 @@
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
+    AssertPtrReturn(pvBuf,      VERR_INVALID_POINTER);
+    AssertReturn(cbBuf,         VERR_INVALID_PARAMETER);
     /* pcbRead is optional. */
 
-    PDRVHOSTPULSEAUDIO pThis = PDMIHOSTAUDIO_2_DRVHOSTPULSEAUDIO(pInterface);
-    PPULSEAUDIOSTREAM  pStrm = (PPULSEAUDIOSTREAM)pStream;
+    PDRVHOSTPULSEAUDIO pThis     = PDMIHOSTAUDIO_2_DRVHOSTPULSEAUDIO(pInterface);
+    PPULSEAUDIOSTREAM  pStreamPA = (PPULSEAUDIOSTREAM)pStream;
 
     /* We should only call pa_stream_readable_size() once and trust the first value. */
     pa_threaded_mainloop_lock(pThis->pMainLoop);
-    size_t cbAvail = pa_stream_readable_size(pStrm->pPAStream);
+    size_t cbAvail = pa_stream_readable_size(pStreamPA->pPAStream);
     pa_threaded_mainloop_unlock(pThis->pMainLoop);
 
     if (cbAvail == (size_t)-1)
-        return paError(pStrm->pDrv, "Failed to determine input data size");
+        return paError(pStreamPA->pDrv, "Failed to determine input data size");
 
     /* If the buffer was not dropped last call, add what remains. */
-    if (pStrm->pu8PeekBuf)
-    {
-        Assert(pStrm->cbPeekBuf >= pStrm->offPeekBuf);
-        cbAvail += (pStrm->cbPeekBuf - pStrm->offPeekBuf);
+    if (pStreamPA->pu8PeekBuf)
+    {
+        Assert(pStreamPA->cbPeekBuf >= pStreamPA->offPeekBuf);
+        cbAvail += (pStreamPA->cbPeekBuf - pStreamPA->offPeekBuf);
     }
 
@@ -805 +793 @@
     int rc = VINF_SUCCESS;
 
-    size_t cbToRead = RT_MIN(cbAvail, AudioMixBufFreeBytes(&pStream->MixBuf));
+    size_t cbToRead = RT_MIN(cbAvail, cbBuf);
 
     Log3Func(("cbToRead=%zu, cbAvail=%zu, offPeekBuf=%zu, cbPeekBuf=%zu\n",
-              cbToRead, cbAvail, pStrm->offPeekBuf, pStrm->cbPeekBuf));
-
-    uint32_t cWrittenTotal = 0;
+              cbToRead, cbAvail, pStreamPA->offPeekBuf, pStreamPA->cbPeekBuf));
+
+    uint32_t cbReadTotal = 0;
 
     while (cbToRead)
     {
         /* If there is no data, do another peek. */
-        if (!pStrm->pu8PeekBuf)
+        if (!pStreamPA->pu8PeekBuf)
         {
             pa_threaded_mainloop_lock(pThis->pMainLoop);
-            pa_stream_peek(pStrm->pPAStream,
-                           (const void**)&pStrm->pu8PeekBuf, &pStrm->cbPeekBuf);
+            pa_stream_peek(pStreamPA->pPAStream,
+                           (const void**)&pStreamPA->pu8PeekBuf, &pStreamPA->cbPeekBuf);
             pa_threaded_mainloop_unlock(pThis->pMainLoop);
 
-            pStrm->offPeekBuf = 0;
+            pStreamPA->offPeekBuf = 0;
 
             /* No data anymore?
              * Note: If there's a data hole (cbPeekBuf then contains the length of the hole)
              *       we need to drop the stream lateron. */
-            if (   !pStrm->pu8PeekBuf
-                && !pStrm->cbPeekBuf)
+            if (   !pStreamPA->pu8PeekBuf
+                && !pStreamPA->cbPeekBuf)
             {
                 break;
@@ -834 +822 @@
         }
 
-        Assert(pStrm->cbPeekBuf >= pStrm->offPeekBuf);
-        size_t cbToWrite = RT_MIN(pStrm->cbPeekBuf - pStrm->offPeekBuf, cbToRead);
+        Assert(pStreamPA->cbPeekBuf >= pStreamPA->offPeekBuf);
+        size_t cbToWrite = RT_MIN(pStreamPA->cbPeekBuf - pStreamPA->offPeekBuf, cbToRead);
 
         Log3Func(("cbToRead=%zu, cbToWrite=%zu, offPeekBuf=%zu, cbPeekBuf=%zu, pu8PeekBuf=%p\n",
                   cbToRead, cbToWrite,
-                  pStrm->offPeekBuf, pStrm->cbPeekBuf, pStrm->pu8PeekBuf));
+                  pStreamPA->offPeekBuf, pStreamPA->cbPeekBuf, pStreamPA->pu8PeekBuf));
 
         if (cbToWrite)
         {
-            uint32_t cWritten;
-            rc = AudioMixBufWriteCirc(&pStream->MixBuf,
-                                      pStrm->pu8PeekBuf + pStrm->offPeekBuf,
-                                      cbToWrite, &cWritten);
-            if (RT_FAILURE(rc))
-                break;
-
-            uint32_t cbWritten = AUDIOMIXBUF_S2B(&pStream->MixBuf, cWritten);
-
-            Assert(cbToRead >= cbWritten);
-            cbToRead -= cbWritten;
-            cWrittenTotal += cWritten;
-            pStrm->offPeekBuf += cbWritten;
+            memcpy((uint8_t *)pvBuf + cbReadTotal, pStreamPA->pu8PeekBuf + pStreamPA->offPeekBuf, cbToWrite);
+
+            Assert(cbToRead >= cbToWrite);
+            cbToRead          -= cbToWrite;
+            cbReadTotal       += cbToWrite;
+
+            pStreamPA->offPeekBuf += cbToWrite;
+            Assert(pStreamPA->offPeekBuf <= pStreamPA->cbPeekBuf);
         }
 
@@ -861 +844 @@
                !cbToWrite
             /* Was there a hole in the peeking buffer? Drop it. */
-            || !pStrm->pu8PeekBuf
+            || !pStreamPA->pu8PeekBuf
             /* If the buffer is done, drop it. */
-            || pStrm->offPeekBuf == pStrm->cbPeekBuf)
+            || pStreamPA->offPeekBuf == pStreamPA->cbPeekBuf)
         {
             pa_threaded_mainloop_lock(pThis->pMainLoop);
-            pa_stream_drop(pStrm->pPAStream);
+            pa_stream_drop(pStreamPA->pPAStream);
             pa_threaded_mainloop_unlock(pThis->pMainLoop);
 
-            pStrm->pu8PeekBuf = NULL;
+            pStreamPA->pu8PeekBuf = NULL;
         }
     }
@@ -875 +858 @@
     if (RT_SUCCESS(rc))
     {
-        uint32_t cProcessed = 0;
-        if (cWrittenTotal)
-            rc = AudioMixBufMixToParent(&pStream->MixBuf, cWrittenTotal, &cProcessed);
-
         if (pcbRead)
-            *pcbRead = cWrittenTotal;
-
-        Log3Func(("cWrittenTotal=%RU32 (%RU32 processed), rc=%Rrc\n",
-                  cWrittenTotal, cProcessed, rc));
-    }
-
-    if (RT_FAILURE(rc))
-        LogFunc(("Failed with %Rrc\n", rc));
+            *pcbRead = cbReadTotal;
+    }
 
     return rc;
@@ -903 +876 @@
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
+    AssertPtrReturn(pvBuf,      VERR_INVALID_POINTER);
+    AssertReturn(cbBuf,         VERR_INVALID_PARAMETER);
     /* pcbWritten is optional. */
 
@@ -909 +884 @@
 
     int rc = VINF_SUCCESS;
-    uint32_t cbReadTotal = 0;
-
-    uint32_t cLive = AudioMixBufUsed(&pStream->MixBuf);
-    if (!cLive)
-    {
-        Log3Func(("No live samples, skipping\n"));
-        if (pcbWritten)
-            *pcbWritten = 0;
-        return VINF_SUCCESS;
-    }
+
+    uint32_t cbWrittenTotal = 0;
 
     pa_threaded_mainloop_lock(pThis->pMainLoop);
@@ -931 +898 @@
         }
 
-        size_t cbLive   = AUDIOMIXBUF_S2B(&pStream->MixBuf, cLive);
-        size_t cbToRead = RT_MIN(cbWriteable, cbLive);
-
-        Log3Func(("cbToRead=%zu, cbWriteable=%zu, cbLive=%zu\n",
-                  cbToRead, cbWriteable, cbLive));
-
-        uint32_t cRead, cbRead;
-        while (cbToRead)
-        {
-            rc = AudioMixBufReadCirc(&pStream->MixBuf, pPAStream->pvPCMBuf,
-                                     RT_MIN(cbToRead, pPAStream->cbPCMBuf), &cRead);
-            if (   !cRead
-                || RT_FAILURE(rc))
-            {
-                break;
-            }
-
-            cbRead = AUDIOMIXBUF_S2B(&pStream->MixBuf, cRead);
-            if (pa_stream_write(pPAStream->pPAStream, pPAStream->pvPCMBuf, cbRead, NULL /* Cleanup callback */,
+        size_t cbToWrite = RT_MIN(cbWriteable, cbBuf);
+
+        uint32_t cbWritten;
+        while (cbToWrite)
+        {
+            cbWritten = cbToWrite;
+            if (pa_stream_write(pPAStream->pPAStream, (uint8_t *)pvBuf + cbWrittenTotal, cbWritten, NULL /* Cleanup callback */,
                                 0, PA_SEEK_RELATIVE) < 0)
             {
@@ -956 +911 @@
             }
 
-            Assert(cbToRead >= cbRead);
-            cbToRead    -= cbRead;
-            cbReadTotal += cbRead;
-
-            Log3Func(("\tcRead=%RU32 (%zu bytes) cbReadTotal=%RU32, cbToRead=%RU32\n",
-                      cRead, AUDIOMIXBUF_S2B(&pStream->MixBuf, cRead), cbReadTotal, cbToRead));
+            Assert(cbToWrite >= cbWritten);
+            cbToWrite      -= cbWritten;
+            cbWrittenTotal += cbWritten;
         }
 
@@ -970 +922 @@
     if (RT_SUCCESS(rc))
     {
-        uint32_t cReadTotal = AUDIOMIXBUF_B2S(&pStream->MixBuf, cbReadTotal);
-        if (cReadTotal)
-            AudioMixBufFinish(&pStream->MixBuf, cReadTotal);
-
         if (pcbWritten)
-            *pcbWritten = cReadTotal;
-
-        Log3Func(("cReadTotal=%RU32 (%RU32 bytes), rc=%Rrc\n", cReadTotal, cbReadTotal, rc));
-    }
-
-    if (RT_FAILURE(rc))
-        LogFunc(("Failed with %Rrc\n", rc));
+            *pcbWritten = cbWrittenTotal;
+    }
 
     return rc;
@@ -1230 +1173 @@
 
         pa_threaded_mainloop_unlock(pThis->pMainLoop);
-    }
-
-    if (pStrm->pvPCMBuf)
-    {
-        RTMemFree(pStrm->pvPCMBuf);
-        pStrm->pvPCMBuf = NULL;
-        pStrm->cbPCMBuf = 0;
     }
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2016 Oracle Corporation
+ * Copyright (C) 2016-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25 +25 @@
 
 #include "DrvAudio.h"
-#include "AudioMixBuffer.h"
 #include "VBoxDD.h"