Changeset 58983 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Dec 4, 2015 2:15:30 PM (9 years ago)

Author:

vboxsync

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

104507

Message:

Audio: Added support for dynamically enabling/disabling host audio backends, more code for audio callback support (still disabled).

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevIchAc97.cpp (modified) (10 diffs)
• DevIchHda.cpp (modified) (11 diffs)
• DevSB16.cpp (modified) (8 diffs)
• DrvAudio.cpp (modified) (2 diffs)
• DrvHostDSound.cpp (modified) (19 diffs)
• DrvHostNullAudio.cpp (modified) (1 diff)

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

@@ -33 +33 @@
 
 #include "VBoxDD.h"
+
+#include "AudioMixBuffer.h"
 #include "AudioMixer.h"
 
@@ -276 +278 @@
     AC97BusMasterRegs       bm_regs[3];
     uint8_t                 mixer_data[256];
+#ifndef VBOX_WITH_AUDIO_CALLBACKS
     /** The emulation timer for handling the attached
      *  LUN drivers. */
     PTMTIMERR3              pTimer;
     /** Timer ticks for handling the LUN drivers. */
-    uint64_t                uTicks;
+    uint64_t                uTimerTicks;
+    /** Timestamp (delta) since last timer call. */
+    uint64_t                uTimerTS;
+#endif
 #ifdef VBOX_WITH_STATISTICS
 # if HC_ARCH_BITS == 32
@@ -365 +371 @@
 #define GET_BM(a_idx)   ( ((a_idx) >> 4) & 3 )
 
+#ifndef VBOX_WITH_AUDIO_CALLBACKS
 static DECLCALLBACK(void) ichac97Timer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser);
+#endif
 static int ichac97TransferAudio(PAC97STATE pThis, int index, uint32_t cbElapsed);
 
@@ -1005 +1013 @@
     while (cbToWrite)
     {
-        uint32_t cbWrittenMin = UINT32_MAX;
-
         cbToRead = RT_MIN(cbToWrite, pThis->cbReadWriteBuf);
         PDMDevHlpPhysRead(pDevIns, addr, pThis->pvReadWriteBuf, cbToRead); /** @todo Check rc? */
@@ -1019 +1025 @@
             int rc2 = pDrv->pConnector->pfnWrite(pDrv->pConnector, pDrv->Out.pStrmOut,
                                                  pThis->pvReadWriteBuf, cbToRead, &cbWritten);
-            AssertRCBreak(rc);
-            if (RT_FAILURE(rc2))
-                continue;
-
-            cbWrittenMin = RT_MIN(cbWrittenMin, cbWritten);
-            LogFlowFunc(("\tLUN#%RU8: cbWritten=%RU32, cWrittenMin=%RU32\n", pDrv->uLUN, cbWritten, cbWrittenMin));
-        }
-
-        LogFlowFunc(("\tcbToRead=%RU32, cbWrittenMin=%RU32, cbToWrite=%RU32, cbLeft=%RU32\n",
-                     cbToRead, cbWrittenMin, cbToWrite, cbToWrite - cbWrittenMin));
-
-        if (!cbWrittenMin)
-        {
-            rc = VINF_EOF;
-            break;
-        }
-
-        Assert(cbWrittenMin != UINT32_MAX);
-        Assert(cbToWrite >= cbWrittenMin);
-        cbToWrite      -= cbWrittenMin;
-        addr           += cbWrittenMin;
-        cbWrittenTotal += cbWrittenMin;
+            LogFlowFunc(("\tLUN#%RU8: rc=%Rrc, cbWritten=%RU32\n", pDrv->uLUN, rc2, cbWritten));
+        }
+
+        LogFlowFunc(("\tcbToRead=%RU32, cbToWrite=%RU32, cbLeft=%RU32\n",
+                     cbToRead, cbToWrite, cbToWrite - cbWrittenTotal));
+
+        Assert(cbToWrite >= cbToRead);
+        cbToWrite      -= cbToRead;
+        addr           += cbToRead;
+        cbWrittenTotal += cbToRead;
     }
 
@@ -1163 +1157 @@
 }
 
+#ifndef VBOX_WITH_AUDIO_CALLBACKS
+
 static DECLCALLBACK(void) ichac97Timer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
@@ -1178 +1174 @@
 
     uint32_t cbIn, cbOut, cSamplesLive;
+
+    uint64_t uTicksNow     = PDMDevHlpTMTimeVirtGet(pDevIns);
+    uint64_t uTicksElapsed = uTicksNow  - pThis->uTimerTS;
+    uint64_t uTicksPerSec  = PDMDevHlpTMTimeVirtGetFreq(pDevIns);
+
+    pThis->uTimerTS = uTicksNow;
+
     RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
     {
+        cbIn = cbOut = 0;
         rc = pDrv->pConnector->pfnQueryStatus(pDrv->pConnector,
-                                              &cbIn, &cbOut, &cSamplesLive);
+                                              &cbIn, &cbOut, NULL /* cSamplesLive */);
         if (RT_SUCCESS(rc))
-        {
-#ifdef DEBUG_TIMER
-            LogFlowFunc(("\tLUN#%RU8: [1] cbIn=%RU32, cbOut=%RU32\n", pDrv->uLUN, cbIn, cbOut));
-#endif
-            if (cSamplesLive)
-            {
-                uint32_t cSamplesPlayed;
-                int rc2 = pDrv->pConnector->pfnPlayOut(pDrv->pConnector, &cSamplesPlayed);
-#ifdef DEBUG_TIMER
-                if (RT_SUCCESS(rc2))
-                    LogFlowFunc(("LUN#%RU8: cSamplesLive=%RU32, cSamplesPlayed=%RU32\n",
-                                 pDrv->uLUN, cSamplesLive, cSamplesPlayed));
-#endif
-                if (cSamplesPlayed)
-                {
-                    rc = pDrv->pConnector->pfnQueryStatus(pDrv->pConnector,
-                                                          &cbIn, &cbOut, &cSamplesLive);
-#ifdef DEBUG_TIMER
-                    if (RT_SUCCESS(rc))
-                        LogFlowFunc(("\tLUN#%RU8: [2] cbIn=%RU32, cbOut=%RU32\n", pDrv->uLUN, cbIn, cbOut));
-#endif
-                }
-            }
-
-            cbInMax  = RT_MAX(cbInMax, cbIn);
-            cbOutMin = RT_MIN(cbOutMin, cbOut);
-        }
+            rc = pDrv->pConnector->pfnPlayOut(pDrv->pConnector, NULL /* cSamplesPlayed */);
+
+        uint32_t cSamplesMin  = (int)((2 * uTicksElapsed * pDrv->Out.pStrmOut->Props.uHz + uTicksPerSec) / uTicksPerSec / 2);
+        uint32_t cbSamplesMin = AUDIOMIXBUF_S2B(&pDrv->Out.pStrmOut->MixBuf, cSamplesMin);
+
+        LogFlowFunc(("LUN#%RU8: rc=%Rrc, cbOut=%RU32, cSamplesMin=%RU32, cbSamplesMin=%RU32\n",
+                     pDrv->uLUN, rc, cbOut, cSamplesMin, cbSamplesMin));
+
+        if (   RT_FAILURE(rc)
+            && cbSamplesMin > cbOut)
+        {
+            LogFlowFunc(("LUN#%RU8: Adj: %RU32 -> %RU32\n", pDrv->uLUN, cbOut, cbSamplesMin));
+            cbOut = cbSamplesMin;
+        }
+
+        cbOutMin = RT_MIN(cbOutMin, cbOut);
+        cbInMax  = RT_MAX(cbInMax, cbIn);
     }
 
@@ -1234 +1228 @@
         ichac97TransferAudio(pThis, PI_INDEX, cbInMax); /** @todo Add rc! */
 
-    TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->uTicks);
+    TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->uTimerTicks);
 
     STAM_PROFILE_STOP(&pThis->StatTimer, a);
 }
+
+#endif
 
 static int ichac97TransferAudio(PAC97STATE pThis, int index, uint32_t cbElapsed)
@@ -2325 +2321 @@
     }
 
+# ifndef VBOX_WITH_AUDIO_CALLBACKS
     if (RT_SUCCESS(rc))
     {
@@ -2334 +2331 @@
         if (RT_SUCCESS(rc))
         {
-            pThis->uTicks = PDMDevHlpTMTimeVirtGetFreq(pDevIns) / 200; /** Hz. @todo Make this configurable! */
-            if (pThis->uTicks < 100)
-                pThis->uTicks = 100;
-            LogFunc(("Timer ticks=%RU64\n", pThis->uTicks));
+            pThis->uTimerTicks = PDMDevHlpTMTimeVirtGetFreq(pDevIns) / 200; /** Hz. @todo Make this configurable! */
+            pThis->uTimerTS    = PDMDevHlpTMTimeVirtGet(pDevIns);
+            if (pThis->uTimerTicks < 100)
+                pThis->uTimerTicks = 100;
+            LogFunc(("Timer ticks=%RU64\n", pThis->uTimerTicks));
 
             /* Fire off timer. */
-            TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->uTicks);
-        }
-    }
+            TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->uTimerTicks);
+        }
+    }
+# else
+    if (RT_SUCCESS(rc))
+    {
+        PAC97DRIVER pDrv;
+        RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
+        {
+            /* Only register primary driver.
+             * The device emulation does the output multiplexing then. */
+            if (pDrv->Flags != PDMAUDIODRVFLAG_PRIMARY)
+                continue;
+
+            PDMAUDIOCALLBACK AudioCallbacks[2];
+
+            AC97CALLBACKCTX Ctx = { pThis, pDrv };
+
+            AudioCallbacks[0].enmType     = PDMAUDIOCALLBACKTYPE_INPUT;
+            AudioCallbacks[0].pfnCallback = ac97CallbackInput;
+            AudioCallbacks[0].pvCtx       = &Ctx;
+            AudioCallbacks[0].cbCtx       = sizeof(AC97CALLBACKCTX);
+
+            AudioCallbacks[1].enmType     = PDMAUDIOCALLBACKTYPE_OUTPUT;
+            AudioCallbacks[1].pfnCallback = ac97CallbackOutput;
+            AudioCallbacks[1].pvCtx       = &Ctx;
+            AudioCallbacks[1].cbCtx       = sizeof(AC97CALLBACKCTX);
+
+            rc = pDrv->pConnector->pfnRegisterCallbacks(pDrv->pConnector, AudioCallbacks, RT_ELEMENTS(AudioCallbacks));
+            if (RT_FAILURE(rc))
+                break;
+        }
+    }
+# endif
 
 # ifdef VBOX_WITH_STATISTICS

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

@@ -42 +42 @@
 #include "VBoxDD.h"
 
+#include "AudioMixBuffer.h"
 #include "AudioMixer.h"
 #include "DevIchHdaCodec.h"
@@ -723 +724 @@
     /** Flag whether the RC part is enabled. */
     bool                               fRCEnabled;
+#ifndef VBOX_WITH_AUDIO_CALLBACKS
     /** The emulation timer for handling the attached
      *  LUN drivers. */
     PTMTIMERR3                         pTimer;
     /** Timer ticks for handling the LUN drivers. */
-    uint64_t                           uTicks;
+    uint64_t                           uTimerTicks;
+    /** Timestamp (delta) since last timer call. */
+    uint64_t                           uTimerTS;
+#endif
 #ifdef VBOX_WITH_STATISTICS
 # ifndef VBOX_WITH_AUDIO_CALLBACKS
@@ -1716 +1721 @@
     *pu32Value = (uint32_t)ASMMultU64ByU32DivByU32(PDMDevHlpTMTimeVirtGetNano(pThis->CTX_SUFF(pDevIns))
                                                    - pThis->u64BaseTS, 24, 1000);
+    LogFlowFunc(("%RU32\n", *pu32Value));
     return VINF_SUCCESS;
 }
@@ -2088 +2094 @@
 #ifdef IN_RING3
 # ifdef VBOX_WITH_HDA_CODEC_EMU
-    /* No reason to reopen voice with same settings. */
+    /* No reason to re-open stream with same settings. */
     if (u32Value == HDA_REG_IND(pThis, iReg))
         return VINF_SUCCESS;
@@ -2111 +2117 @@
 #  endif
         default:
-            LogFunc(("Warning: Attempt to change format on register %d\n", iReg));
+            LogFunc(("Warning: Attempt to change format on register %RU32\n", iReg));
             break;
     }
@@ -2395 +2401 @@
             }
         }
-
-        Log(("HDADEBUG: cb2Copy=%RU32, CVI(len:%RU32, pos:%RU32), CBLL=%RU32, FIFOS=%RU32, Avail=%RU32\n",
-             cbFree, pBDLE->u32BufSize, pBDLE->State.u32BufOff, pStrmSt->u32CBL - HDA_STREAM_REG(pThis, LPIB, pStrmSt->u8Strm), pStrmSt->u16FIFOS, 0));
     }
 
@@ -2815 +2818 @@
     RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
     {
-        if (RTStrAPrintf(&pszDesc, "[LUN#%RU8] %s", pDrv->uLUN, pszName) <= 0)
+        if (RTStrAPrintf(&pszDesc, "[LUN#%RU8] %s (%RU32Hz, %RU8 %s)",
+                         pDrv->uLUN, pszName, pCfg->uHz, pCfg->cChannels, pCfg->cChannels > 1 ? "Channels" : "Channel") <= 0)
         {
             rc = VERR_NO_MEMORY;
@@ -2874 +2878 @@
 {
     PHDASTATE pThis = PDMINS_2_DATA(pDevIns, PHDASTATE);
-    AssertPtr(pThis);
+    AssertPtrReturnVoid(pThis);
 
     STAM_PROFILE_START(&pThis->StatTimer, a);
@@ -2886 +2890 @@
 
     uint32_t cbIn, cbOut, cSamplesLive;
+
+    uint64_t uTicksNow     = PDMDevHlpTMTimeVirtGet(pDevIns);
+    uint64_t uTicksElapsed = uTicksNow  - pThis->uTimerTS;
+    uint64_t uTicksPerSec  = PDMDevHlpTMTimeVirtGetFreq(pDevIns);
+
+    pThis->uTimerTS = uTicksNow;
+
     RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
     {
+        cbIn = cbOut = 0;
         rc = pDrv->pConnector->pfnQueryStatus(pDrv->pConnector,
-                                              &cbIn, &cbOut, &cSamplesLive);
+                                              &cbIn, &cbOut, NULL /* cSamplesLive */);
         if (RT_SUCCESS(rc))
-        {
-#ifdef DEBUG_TIMER
-            LogFlowFunc(("\tLUN#%RU8: [1] cbIn=%RU32, cbOut=%RU32\n", pDrv->uLUN, cbIn, cbOut));
-#endif
-            if (cSamplesLive)
-            {
-                uint32_t cSamplesPlayed;
-                int rc2 = pDrv->pConnector->pfnPlayOut(pDrv->pConnector, &cSamplesPlayed);
-                if (RT_SUCCESS(rc2))
-                    LogFlowFunc(("LUN#%RU8: cSamplesLive=%RU32, cSamplesPlayed=%RU32\n",
-                                 pDrv->uLUN, cSamplesLive, cSamplesPlayed));
-
-                rc = pDrv->pConnector->pfnQueryStatus(pDrv->pConnector,
-                                                      &cbIn, &cbOut, &cSamplesLive);
-#ifdef DEBUG_TIMER
-                if (RT_SUCCESS(rc))
-                    LogFlowFunc(("\tLUN#%RU8: [2] cbIn=%RU32, cbOut=%RU32\n", pDrv->uLUN, cbIn, cbOut));
-#endif
-            }
-
-            cbInMax  = RT_MAX(cbInMax, cbIn);
-            cbOutMin = RT_MIN(cbOutMin, cbOut);
-        }
+            rc = pDrv->pConnector->pfnPlayOut(pDrv->pConnector, NULL /* cSamplesPlayed */);
+
+        uint32_t cSamplesMin  = (int)((2 * uTicksElapsed * pDrv->Out.pStrmOut->Props.uHz + uTicksPerSec) / uTicksPerSec / 2);
+        uint32_t cbSamplesMin = AUDIOMIXBUF_S2B(&pDrv->Out.pStrmOut->MixBuf, cSamplesMin);
+
+        LogFlowFunc(("LUN#%RU8: rc=%Rrc, cbOut=%RU32, cSamplesMin=%RU32, cbSamplesMin=%RU32\n",
+                     pDrv->uLUN, rc, cbOut, cSamplesMin, cbSamplesMin));
+
+        if (   RT_FAILURE(rc)
+            && cbSamplesMin > cbOut)
+        {
+            LogFlowFunc(("LUN#%RU8: Adj: %RU32 -> %RU32\n", pDrv->uLUN, cbOut, cbSamplesMin));
+            cbOut = cbSamplesMin;
+        }
+
+        cbOutMin = RT_MIN(cbOutMin, cbOut);
+        cbInMax  = RT_MAX(cbInMax, cbIn);
     }
 
@@ -2938 +2944 @@
         hdaTransfer(pThis, PI_INDEX, cbInMax /* cbMax */, NULL /* pcbProcessed */); /** @todo Add rc! */
 
-    TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->uTicks);
+    TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->uTimerTicks);
 
     STAM_PROFILE_STOP(&pThis->StatTimer, a);
@@ -4424 +4430 @@
             /** @todo Investigate why sounds is getting corrupted if the "ticks" value is too
              *        low, e.g. "PDMDevHlpTMTimeVirtGetFreq / 200". */
-            pThis->uTicks = PDMDevHlpTMTimeVirtGetFreq(pDevIns) / 500; /** @todo Make this configurable! */
-            if (pThis->uTicks < 100)
-                pThis->uTicks = 100;
-            LogFunc(("Timer ticks=%RU64\n", pThis->uTicks));
+            pThis->uTimerTicks = PDMDevHlpTMTimeVirtGetFreq(pDevIns) / 500; /** @todo Make this configurable! */
+            pThis->uTimerTS    = PDMDevHlpTMTimeVirtGet(pDevIns);
+            if (pThis->uTimerTicks < 100)
+                pThis->uTimerTicks = 100;
+            LogFunc(("Timer ticks=%RU64\n", pThis->uTimerTicks));
 
             /* Fire off timer. */
-            TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->uTicks);
+            TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->uTimerTicks);
         }
     }

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

@@ -55 +55 @@
 #include "VBoxDD.h"
 
+#include "AudioMixBuffer.h"
 #include "AudioMixer.h"
 
@@ -178 +179 @@
     /** Audio sink for PCM output. */
     R3PTRTYPE(PAUDMIXSINK)         pSinkOutput;
+#ifndef VBOX_WITH_AUDIO_CALLBACKS
     /** The emulation timer for handling I/O of the attached LUN drivers. */
     PTMTIMERR3                     pTimerIO;
     /** Timer ticks for handling the LUN drivers. */
-    uint64_t                       uTicksIO;
-
+    uint64_t                       uTimerTicksIO;
+    /** Timestamp (delta) since last timer call. */
+    uint64_t                       uTimerTSIO;
+#endif
     PTMTIMER  pTimerIRQ;
     PPDMIBASE pDrvBase;
@@ -1520 +1524 @@
                           uint32_t dma_len, int len)
 {
-    uint8_t     tmpbuf[_4K]; /** @todo Have a buffer on the heap. */
-    uint32_t    cbToWrite = len;
-    uint32_t    cbWrittenTotal = 0;
+    uint8_t  tmpbuf[_4K]; /** @todo Have a buffer on the heap. */
+    uint32_t cbToWrite = len;
+    uint32_t cbWrittenTotal = 0;
 
     while (cbToWrite)
     {
-        uint32_t cbWrittenMin = UINT32_MAX;
         uint32_t cbToRead;
         uint32_t cbRead;
@@ -1546 +1549 @@
             int rc2 = pDrv->pConnector->pfnWrite(pDrv->pConnector, pDrv->Out.pStrmOut,
                                                  tmpbuf, cbToRead, &cbWritten);
-            AssertRCBreak(rc);
-            if (RT_FAILURE(rc2))
-                continue;
-
-            cbWrittenMin = RT_MIN(cbWrittenMin, cbWritten);
-            LogFlowFunc(("\tLUN#%RU8: cbWritten=%RU32, cWrittenMin=%RU32\n", pDrv->uLUN, cbWritten, cbWrittenMin));
+            LogFlowFunc(("\tLUN#%RU8: rc=%Rrc, cbWritten=%RU32, cWrittenMin=%RU32\n", pDrv->uLUN, rc2, cbWritten));
         }
 
-        Assert(cbToWrite >= cbWrittenMin);
-        cbToWrite      -= cbWrittenMin;
-        dma_pos         = (dma_pos + cbWrittenMin) % dma_len;
-        cbWrittenTotal += cbWrittenMin;
-
-        if (!cbRead || !cbWrittenMin)
+        Assert(cbToWrite >= cbToRead);
+        cbToWrite      -= cbToRead;
+        dma_pos         = (dma_pos + cbToRead) % dma_len;
+        cbWrittenTotal += cbToRead;
+
+        if (!cbRead)
             break;
     }
@@ -1664 +1662 @@
     PSB16DRIVER pDrv;
 
-    uint32_t cbIn, cbOut, cSamplesLive;
+    uint32_t cbIn, cbOut;
+
+    uint64_t uTicksNow     = PDMDevHlpTMTimeVirtGet(pDevIns);
+    uint64_t uTicksElapsed = uTicksNow  - pThis->uTimerTSIO;
+    uint64_t uTicksPerSec  = PDMDevHlpTMTimeVirtGetFreq(pDevIns);
+
+    pThis->uTimerTSIO = uTicksNow;
+
     RTListForEach(&pThis->lstDrv, pDrv, SB16DRIVER, Node)
     {
+        cbIn = cbOut = 0;
         rc = pDrv->pConnector->pfnQueryStatus(pDrv->pConnector,
-                                              &cbIn, &cbOut, &cSamplesLive);
+                                              &cbIn, &cbOut, NULL /* cSamplesLive */);
         if (RT_SUCCESS(rc))
-        {
-            LogFlowFunc(("\tLUN#%RU8: [1] cbIn=%RU32, cbOut=%RU32\n", pDrv->uLUN, cbIn, cbOut));
-
-            if (cSamplesLive)
-            {
-                uint32_t cSamplesPlayed;
-                int rc2 = pDrv->pConnector->pfnPlayOut(pDrv->pConnector, &cSamplesPlayed);
-                if (RT_SUCCESS(rc2))
-                    LogFlowFunc(("LUN#%RU8: cSamplesLive=%RU32, cSamplesPlayed=%RU32\n",
-                                 pDrv->uLUN, cSamplesLive, cSamplesPlayed));
-
-                if (cSamplesPlayed)
-                {
-                    rc = pDrv->pConnector->pfnQueryStatus(pDrv->pConnector,
-                                                          &cbIn, &cbOut, &cSamplesLive);
-                    if (RT_SUCCESS(rc))
-                        LogFlowFunc(("\tLUN#%RU8: [2] cbIn=%RU32, cbOut=%RU32\n", pDrv->uLUN, cbIn, cbOut));
-                }
-            }
-
-            cbInMax  = RT_MAX(cbInMax, cbIn);
-            cbOutMin = RT_MIN(cbOutMin, cbOut);
+            rc = pDrv->pConnector->pfnPlayOut(pDrv->pConnector, NULL /* cSamplesPlayed */);
+
+        uint32_t cSamplesMin  = (int)((2 * uTicksElapsed * pDrv->Out.pStrmOut->Props.uHz + uTicksPerSec) / uTicksPerSec / 2);
+        uint32_t cbSamplesMin = AUDIOMIXBUF_S2B(&pDrv->Out.pStrmOut->MixBuf, cSamplesMin);
+
+        LogFlowFunc(("LUN#%RU8: rc=%Rrc, cbOut=%RU32, cSamplesMin=%RU32, cbSamplesMin=%RU32\n",
+                     pDrv->uLUN, rc, cbOut, cSamplesMin, cbSamplesMin));
+
+        if (   RT_FAILURE(rc)
+            && cbSamplesMin > cbOut)
+        {
+            LogFlowFunc(("LUN#%RU8: Adj: %RU32 -> %RU32\n", pDrv->uLUN, cbOut, cbSamplesMin));
+            cbOut = cbSamplesMin;
         }
-    }
-
+
+        cbOutMin = RT_MIN(cbOutMin, cbOut);
+        cbInMax  = RT_MAX(cbInMax, cbIn);
+    }
+
+#ifdef DEBUG_TIMER
     LogFlowFunc(("cbInMax=%RU32, cbOutMin=%RU32\n", cbInMax, cbOutMin));
+#endif
 
     if (cbOutMin == UINT32_MAX)
@@ -1716 +1718 @@
     /** @todo Implement recording. */
 
-    TMTimerSet(pThis->pTimerIO, TMTimerGet(pThis->pTimerIO) + pThis->uTicksIO);
+    TMTimerSet(pThis->pTimerIO, TMTimerGet(pThis->pTimerIO) + pThis->uTimerTicksIO);
 }
 
@@ -2168 +2170 @@
     sb16ResetLegacy(pThis);
 
-    PSB16DRIVER pDrv;
-    uLUN = 0;
-    RTListForEach(&pThis->lstDrv, pDrv, SB16DRIVER, Node)
-    {
-        PPDMIAUDIOCONNECTOR pCon = pDrv->pConnector;
-        AssertPtr(pCon);
-
-        bool fIsOK = pCon->pfnIsOutputOK(pCon, pDrv->Out.pStrmOut);
-        if (fIsOK)
-        {
-            rc = pCon->pfnEnableOut(pCon, pDrv->Out.pStrmOut, true /* fEnable */);
-            fIsOK = RT_SUCCESS(rc);
-        }
-
-        if (!fIsOK)
-        {
-            /*
-             * Only primary drivers are critical for the VM to run. Everything else
-             * might not worth showing an own error message box in the GUI.
-             */
-            if (!(pDrv->Flags & PDMAUDIODRVFLAG_PRIMARY))
-                continue;
-
-            LogRel(("SB16: Warning: Unable to enable/use output for LUN#%RU8\n", uLUN));
-
-            pCon->pfnDestroyOut(pCon, pDrv->Out.pStrmOut);
-            pDrv->Out.pStrmOut = NULL;
-
-            pThis->pDrv->pfnInitNull(pThis->pDrv);
-
-            PDMDevHlpVMSetRuntimeError(pDevIns, 0 /*fFlags*/, "HostAudioNotResponding",
-                N_("No audio devices could be opened. Selecting the NULL audio backend "
-                   "with the consequence that no sound is audible"));
-        }
-
-        uLUN++;
-    }
-
+#ifndef VBOX_WITH_AUDIO_CALLBACKS
     if (RT_SUCCESS(rc))
     {
@@ -2214 +2179 @@
         else
         {
-            pThis->uTicksIO = PDMDevHlpTMTimeVirtGetFreq(pDevIns) / 200; /** Hz. @todo Make this configurable! */
-            if (pThis->uTicksIO < 100)
-                pThis->uTicksIO = 100;
-            LogFunc(("I/O timer ticks=%RU64\n", pThis->uTicksIO));
+            pThis->uTimerTicksIO = PDMDevHlpTMTimeVirtGetFreq(pDevIns) / 200; /** Hz. @todo Make this configurable! */
+            pThis->uTimerTSIO    = PDMDevHlpTMTimeVirtGet(pDevIns);
+            if (pThis->uTimerTicksIO < 100)
+                pThis->uTimerTicksIO = 100;
+            LogFunc(("I/O timer ticks=%RU64\n", pThis->uTimerTicksIO));
 
             /* Fire off timer. */
-            TMTimerSet(pThis->pTimerIO, TMTimerGet(pThis->pTimerIO) + pThis->uTicksIO);
+            TMTimerSet(pThis->pTimerIO, TMTimerGet(pThis->pTimerIO) + pThis->uTimerTicksIO);
         }
     }
+#else
+    if (RT_SUCCESS(rc))
+    {
+        PSB16DRIVER pDrv;
+        RTListForEach(&pThis->lstDrv, pDrv, SB16DRIVER, Node)
+        {
+            /* Only register primary driver.
+             * The device emulation does the output multiplexing then. */
+            if (pDrv->Flags != PDMAUDIODRVFLAG_PRIMARY)
+                continue;
+
+            PDMAUDIOCALLBACK AudioCallbacks[2];
+
+            SB16CALLBACKCTX Ctx = { pThis, pDrv };
+
+            AudioCallbacks[0].enmType     = PDMAUDIOCALLBACKTYPE_INPUT;
+            AudioCallbacks[0].pfnCallback = sb16CallbackInput;
+            AudioCallbacks[0].pvCtx       = &Ctx;
+            AudioCallbacks[0].cbCtx       = sizeof(SB16CALLBACKCTX);
+
+            AudioCallbacks[1].enmType     = PDMAUDIOCALLBACKTYPE_OUTPUT;
+            AudioCallbacks[1].pfnCallback = sb16CallbackOutput;
+            AudioCallbacks[1].pvCtx       = &Ctx;
+            AudioCallbacks[1].cbCtx       = sizeof(SB16CALLBACKCTX);
+
+            rc = pDrv->pConnector->pfnRegisterCallbacks(pDrv->pConnector, AudioCallbacks, RT_ELEMENTS(AudioCallbacks));
+            if (RT_FAILURE(rc))
+                break;
+        }
+    }
+#endif
 
     return VINF_SUCCESS;

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

@@ -1053 +1053 @@
               pHstStrmOut->MixBuf.pszName));
 
+    if (!AudioMixBufFreeBytes(&pGstStrmOut->MixBuf))
+    {
+        if (pcbWritten)
+            *pcbWritten = 0;
+        return VINF_SUCCESS;
+    }
+
     /*
      * First, write data from the device emulation into our
@@ -1752 +1759 @@
         AssertPtr(pHstStrmOut);
 
-        if (pGstStrmOut->State.fActive != fEnable) /* Only process real state changes. */
-        {
-            if (fEnable)
+        if (fEnable)
+        {
+            /* Is a pending disable outstanding? Then disable first. */
+            if (pHstStrmOut->fStatus & PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE)
             {
-                pHstStrmOut->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE;
-                if (!(pHstStrmOut->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED))
-                    rc = drvAudioControlHstOut(pThis, pHstStrmOut, PDMAUDIOSTREAMCMD_ENABLE);
+                rc = drvAudioControlHstOut(pThis, pHstStrmOut, PDMAUDIOSTREAMCMD_DISABLE);
+                if (RT_SUCCESS(rc))
+                    pHstStrmOut->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE;
             }
-            else /* Disable */
+
+            if (RT_SUCCESS(rc))
+                rc = drvAudioControlHstOut(pThis, pHstStrmOut, PDMAUDIOSTREAMCMD_ENABLE);
+        }
+        else /* Disable */
+        {
+            if (pHstStrmOut->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED)
             {
-                if (pHstStrmOut->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED)
+                uint32_t cGstStrmsActive = 0;
+
+                /*
+                 * Check if there are any active guest streams assigned
+                 * to this host stream which still are being marked as active.
+                 *
+                 * In that case we have to defer closing the host stream and
+                 * wait until all guest streams have been finished.
+                 */
+                PPDMAUDIOGSTSTRMOUT pIter;
+                RTListForEach(&pHstStrmOut->lstGstStrmOut, pIter, PDMAUDIOGSTSTRMOUT, Node)
                 {
-                    uint32_t cGstStrmsActive = 0;
-
-                    /*
-                     * Check if there are any active guest streams assigned
-                     * to this host stream which still are being marked as active.
-                     *
-                     * In that case we have to defer closing the host stream and
-                     * wait until all guest streams have been finished.
-                     */
-                    PPDMAUDIOGSTSTRMOUT pIter;
-                    RTListForEach(&pHstStrmOut->lstGstStrmOut, pIter, PDMAUDIOGSTSTRMOUT, Node)
+                    if (pIter->State.fActive)
                     {
-                        if (pIter->State.fActive)
-                        {
-                            cGstStrmsActive++;
-                            break; /* At least one assigned & active guest stream is enough. */
-                        }
+                        cGstStrmsActive++;
+                        break; /* At least one assigned & active guest stream is enough. */
                     }
-
-                    /* Do we need to defer closing the host stream? */
-                    if (cGstStrmsActive >= 1)
-                        pHstStrmOut->fStatus |= PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE;
-
-                    /* Can we close the host stream now instead of deferring it? */
-                    if (!(pHstStrmOut->fStatus & PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE))
-                        rc = drvAudioControlHstOut(pThis, pHstStrmOut, PDMAUDIOSTREAMCMD_DISABLE);
                 }
+
+                /* Do we need to defer closing the host stream? */
+                if (cGstStrmsActive >= 1)
+                    pHstStrmOut->fStatus |= PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE;
+
+                /* Can we close the host stream now instead of deferring it? */
+                if (!(pHstStrmOut->fStatus & PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE))
+                    rc = drvAudioControlHstOut(pThis, pHstStrmOut, PDMAUDIOSTREAMCMD_DISABLE);
             }
-
-            if (RT_SUCCESS(rc))
-                pGstStrmOut->State.fActive = fEnable;
-
-            LogFlowFunc(("%s: fEnable=%RTbool, fStatus=0x%x, rc=%Rrc\n",
-                         pGstStrmOut->MixBuf.pszName, fEnable, pHstStrmOut->fStatus, rc));
-        }
+        }
+
+        if (RT_SUCCESS(rc))
+            pGstStrmOut->State.fActive = fEnable;
+
+        LogFlowFunc(("%s: fEnable=%RTbool, fStatus=0x%x, rc=%Rrc\n",
+                     pGstStrmOut->MixBuf.pszName, fEnable, pHstStrmOut->fStatus, rc));
     }
 

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

@@ -123 +123 @@
     /** DirectSound configuration options. */
     DSOUNDHOSTCFG       cfg;
+    /** Whether the input currently is in an enabled (working)
+     *  state or not. */
+    bool                fEnabledIn;
+    /** Whether the output currently is in an enabled (working)
+     *  state or not. */
+    bool                fEnabledOut;
 #ifdef VBOX_WITH_AUDIO_CALLBACKS
     /** Pointer to the audio connector interface of the driver/device above us. */
@@ -137 +143 @@
      *  Must not exceed VBOX_DSOUND_MAX_EVENTS. */
     uint8_t             cEvents;
-    PDSOUNDSTREAMIN     pStrmIn;
-    PDSOUNDSTREAMOUT    pStrmOut;
+    /** Pointer to the input stream. */
+    PDSOUNDSTREAMIN     pDSStrmIn;
+    /** Pointer to the output stream. */
+    PDSOUNDSTREAMOUT    pDSStrmOut;
 #endif
 } DRVHOSTDSOUND, *PDRVHOSTDSOUND;
@@ -162 +170 @@
     ( (PDRVHOSTDSOUND)((uintptr_t)pInterface - RT_OFFSETOF(DRVHOSTDSOUND, IHostAudio)) )
 
+static HRESULT directSoundPlayRestore(LPDIRECTSOUNDBUFFER8 pDSB);
+
 static void dsoundDevRemove(PDSOUNDDEV pDev);
 #ifdef VBOX_WITH_AUDIO_CALLBACKS
@@ -174 +184 @@
 static int dsoundWaveFmtFromCfg(PPDMAUDIOSTREAMCFG pCfg, PWAVEFORMATEX pFmt)
 {
+    AssertPtrReturn(pCfg, VERR_INVALID_POINTER);
+    AssertPtrReturn(pFmt, VERR_INVALID_POINTER);
+
     RT_BZERO(pFmt, sizeof(WAVEFORMATEX));
+
     pFmt->wFormatTag      = WAVE_FORMAT_PCM;
     pFmt->nChannels       = pCfg->cChannels;
@@ -211 +225 @@
 }
 
+static int dsoundGetStatusOut(PDSOUNDSTREAMOUT pDSoundStrmOut, DWORD *pdwBuffer, DWORD *pdwFree, DWORD *pdwPlayPos)
+{
+    AssertPtrReturn(pDSoundStrmOut, VERR_INVALID_POINTER);
+
+    LPDIRECTSOUNDBUFFER8 pDSB = pDSoundStrmOut->pDSB;
+    if (!pDSB)
+        return VERR_INVALID_POINTER;
+
+    DWORD cbBuffer = AUDIOMIXBUF_S2B(&pDSoundStrmOut->strmOut.MixBuf, pDSoundStrmOut->csPlaybackBufferSize);
+
+    /* Get the current play position which is used for calculating the free space in the buffer. */
+    DWORD cbPlayPos;
+    HRESULT hr = IDirectSoundBuffer8_GetCurrentPosition(pDSB, &cbPlayPos, NULL);
+    if (hr == DSERR_BUFFERLOST)
+    {
+        hr = directSoundPlayRestore(pDSB);
+        if (SUCCEEDED(hr))
+            hr = IDirectSoundBuffer8_GetCurrentPosition(pDSB, &cbPlayPos, NULL);
+    }
+
+    if (FAILED(hr))
+    {
+        if (hr != DSERR_BUFFERLOST) /* Avoid log flooding if the error is still there. */
+            DSLOGREL(("DSound: Playback: GetCurrentPosition failed with %Rhrc\n", hr));
+        LogFlowFunc(("Failed with %Rhrc\n", hr));
+        return VERR_NOT_AVAILABLE;
+    }
+
+    if (pdwBuffer)
+        *pdwBuffer = cbBuffer;
+
+    if (pdwFree)
+        *pdwFree = cbBuffer - dsoundRingDistance(pDSoundStrmOut->cbPlayWritePos, cbPlayPos, cbBuffer);
+
+    if (pdwPlayPos)
+        *pdwPlayPos = cbPlayPos;
+
+    return VINF_SUCCESS;
+}
+
 static char *dsoundGUIDToUtf8StrA(LPCGUID lpGUID)
 {
@@ -429 +483 @@
                 pThis->cEvents--;
 
-            pThis->pStrmOut = NULL;
+            pThis->pDSStrmOut = NULL;
         }
 
@@ -590 +644 @@
             break;
 
-        pThis->pStrmOut = pDSoundStrmOut;
+        pThis->pDSStrmOut = pDSoundStrmOut;
 
         Assert(pThis->cEvents < VBOX_DSOUND_MAX_EVENTS);
@@ -995 +1049 @@
             else
             {
+                DWORD fFlags = 0;
+#ifndef VBOX_WITH_AUDIO_CALLBACKS
+                fFlags |= DSCBSTART_LOOPING;
+#endif
                 DSLOG(("DSound: Capture start\n"));
-                hr = IDirectSoundCaptureBuffer8_Start(pDSoundStrmIn->pDSCB, DSCBSTART_LOOPING);
+                hr = IDirectSoundCaptureBuffer8_Start(pDSoundStrmIn->pDSCB, fFlags);
                 if (FAILED(hr))
                     DSLOGREL(("DSound: Capture started %Rhrc\n", hr));
@@ -1181 +1239 @@
                 rc = VERR_NOT_SUPPORTED;
 
+            pThis->fEnabledOut = RT_SUCCESS(rc);
             break;
         }
@@ -1218 +1277 @@
     do /* to use 'break' */
     {
-        LPDIRECTSOUNDBUFFER8 pDSB = pDSoundStrmOut->pDSB;
-        if (!pDSB)
-            break;
-
-        int cShift = pHstStrmOut->Props.cShift;
-        DWORD cbBuffer = AUDIOMIXBUF_S2B(&pHstStrmOut->MixBuf, pDSoundStrmOut->csPlaybackBufferSize);
-
-        /* Get the current play position which is used for calculating the free space in the buffer. */
-        DWORD cbPlayPos;
-        HRESULT hr = IDirectSoundBuffer8_GetCurrentPosition(pDSB, &cbPlayPos, NULL);
-        if (hr == DSERR_BUFFERLOST)
-        {
-            hr = directSoundPlayRestore(pDSB);
-            if (SUCCEEDED(hr))
-                hr = IDirectSoundBuffer8_GetCurrentPosition(pDSB, &cbPlayPos, NULL);
-        }
-
-        if (FAILED(hr))
-        {
-            if (hr != DSERR_BUFFERLOST) /* Avoid log flooding if the error is still there. */
-                DSLOGREL(("DSound: Playback GetCurrentPosition %Rhrc\n", hr));
-            break;
-        }
-
-        DWORD cbFree = cbBuffer - dsoundRingDistance(pDSoundStrmOut->cbPlayWritePos, cbPlayPos, cbBuffer);
+        DWORD cbBuffer, cbFree, cbPlayPos;
+        rc = dsoundGetStatusOut(pDSoundStrmOut, &cbBuffer, &cbFree, &cbPlayPos);
+        if (RT_FAILURE(rc))
+        {
+            /* Set the output status to disabled, as we are not able to retrieve the current
+             * status (anymore). */
+            pThis->fEnabledOut = false;
+            break;
+        }
+
         /*
          * Check for full buffer, do not allow the cbPlayWritePos to catch cbPlayPos during playback,
@@ -1266 +1310 @@
         }
 
+        LPDIRECTSOUNDBUFFER8 pDSB = pDSoundStrmOut->pDSB;
+        AssertPtr(pDSB);
+
         LPVOID pv1, pv2;
         DWORD cb1, cb2;
-        hr = directSoundPlayLock(pDSB, &pHstStrmOut->Props, pDSoundStrmOut->cbPlayWritePos, cbLive,
-                                 &pv1, &pv2, &cb1, &cb2, 0 /* dwFlags */);
+        HRESULT hr = directSoundPlayLock(pDSB, &pHstStrmOut->Props, pDSoundStrmOut->cbPlayWritePos, cbLive,
+                                         &pv1, &pv2, &cb1, &cb2, 0 /* dwFlags */);
         if (FAILED(hr))
-            break;
+        {
+            rc = VERR_ACCESS_DENIED;
+            break;
+        }
 
         DWORD len1 = AUDIOMIXBUF_B2S(&pHstStrmOut->MixBuf, cb1);
@@ -1315 +1365 @@
         if (pDSoundStrmOut->fRestartPlayback)
         {
-            /* The playback has been just started.
+            /*
+             * The playback has been just started.
              * Some samples of the new sound have been copied to the buffer
              * and it can start playing.
              */
             pDSoundStrmOut->fRestartPlayback = false;
-            hr = IDirectSoundBuffer8_Play(pDSoundStrmOut->pDSB, 0, 0, DSBPLAY_LOOPING);
+
+            DWORD fFlags = 0;
+#ifndef VBOX_WITH_AUDIO_CALLBACKS
+            fFlags |= DSCBSTART_LOOPING;
+#endif
+            hr = IDirectSoundBuffer8_Play(pDSoundStrmOut->pDSB, 0, 0, fFlags);
             if (FAILED(hr))
             {
-                DSLOGREL(("DSound: Playback start %Rhrc\n", hr));
+                DSLOGREL(("DSound: Playback: Unable to start playing, hr=%Rhrc\n", hr));
                 rc = VERR_NOT_SUPPORTED;
+                break;
             }
         }
+
     } while (0);
 
-    if (pcSamplesPlayed)
-        *pcSamplesPlayed = cReadTotal;
+    if (RT_SUCCESS(rc))
+    {
+        if (pcSamplesPlayed)
+            *pcSamplesPlayed = cReadTotal;
+    }
 
     return rc;
@@ -1421 +1482 @@
             if (FAILED(hr))
                 rc = VERR_NOT_SUPPORTED;
-        } break;
+
+            pThis->fEnabledIn = RT_SUCCESS(rc);
+            break;
+        }
 
         case PDMAUDIOSTREAMCMD_DISABLE:
         {
             directSoundCaptureStop(pDSoundStrmIn);
-        } break;
+            break;
+        }
 
         default:
@@ -1432 +1497 @@
             AssertMsgFailed(("Invalid command %ld\n", enmStreamCmd));
             rc = VERR_INVALID_PARAMETER;
-        } break;
+            break;
+        }
     }
 
@@ -1447 +1513 @@
     int rc = VINF_SUCCESS;
 
-    if (pDSCB == NULL)
-    {
-        if (pcSamplesCaptured) /** @todo single point of return */
-            *pcSamplesCaptured = 0;
-        return VINF_SUCCESS;
-    }
-
-    /* Get DirectSound capture position in bytes. */
-    DWORD cbReadPos;
-    HRESULT hr = IDirectSoundCaptureBuffer_GetCurrentPosition(pDSCB, NULL, &cbReadPos);
-    if (FAILED(hr))
-    {
-        if (hr != pDSoundStrmIn->hrLastCaptureIn)
-        {
-            DSLOGREL(("DSound: Capture GetCurrentPosition %Rhrc\n", hr));
-            pDSoundStrmIn->hrLastCaptureIn = hr;
-        }
-
-        if (pcSamplesCaptured)
-            *pcSamplesCaptured = 0;
-        return VINF_SUCCESS;
-    }
-    pDSoundStrmIn->hrLastCaptureIn = hr;
-
-    if (cbReadPos & pHstStrmIn->Props.uAlign)
-        DSLOGF(("DSound: Misaligned capture read position %ld (alignment: %RU32)\n", cbReadPos, pHstStrmIn->Props.uAlign));
-
-    /* Capture position in samples. */
-    DWORD csReadPos = cbReadPos >> pHstStrmIn->Props.cShift;
-
-    /* Number of samples available in the DirectSound capture buffer. */
-    DWORD csCaptured = dsoundRingDistance(csReadPos, pDSoundStrmIn->csCaptureReadPos, pDSoundStrmIn->csCaptureBufferSize);
-    if (csCaptured == 0)
-    {
-        if (pcSamplesCaptured)
-            *pcSamplesCaptured = 0;
-        return VINF_SUCCESS;
-    }
-
-    /* Using as an intermediate not circular buffer. */
-    AudioMixBufReset(&pHstStrmIn->MixBuf);
-
-    /* Get number of free samples in the mix buffer and check that is has free space */
-    uint32_t csMixFree = AudioMixBufFree(&pHstStrmIn->MixBuf);
-    if (csMixFree == 0)
-    {
-        DSLOGF(("DSound: Capture buffer full\n"));
-        if (pcSamplesCaptured)
-            *pcSamplesCaptured = 0;
-        return VINF_SUCCESS;
-    }
-
-    DSLOGF(("DSound: Capture csMixFree=%RU32, csReadPos=%ld, csCaptureReadPos=%ld, csCaptured=%ld\n",
-            csMixFree, csReadPos, pDSoundStrmIn->csCaptureReadPos, csCaptured));
-
-    /* No need to fetch more samples than mix buffer can receive. */
-    csCaptured = RT_MIN(csCaptured, csMixFree);
-
-    /* Lock relevant range in the DirectSound capture buffer. */
-    LPVOID pv1, pv2;
-    DWORD cb1, cb2;
-    hr = directSoundCaptureLock(pDSCB, &pHstStrmIn->Props,
-                                AUDIOMIXBUF_S2B(&pHstStrmIn->MixBuf, pDSoundStrmIn->csCaptureReadPos), /* dwOffset */
-                                AUDIOMIXBUF_S2B(&pHstStrmIn->MixBuf, csCaptured),                      /* dwBytes */
-                                &pv1, &pv2, &cb1, &cb2,
-                                0 /* dwFlags */);
-    if (FAILED(hr))
-    {
-        if (pcSamplesCaptured)
-            *pcSamplesCaptured = 0;
-        return VINF_SUCCESS;
-    }
-
-    DWORD len1 = AUDIOMIXBUF_B2S(&pHstStrmIn->MixBuf, cb1);
-    DWORD len2 = AUDIOMIXBUF_B2S(&pHstStrmIn->MixBuf, cb2);
-
-    uint32_t csWrittenTotal = 0;
-    uint32_t csWritten;
-    if (pv1 && len1)
-    {
-        rc = AudioMixBufWriteAt(&pHstStrmIn->MixBuf, 0 /* offWrite */,
-                                pv1, cb1, &csWritten);
+    uint32_t cCaptured = 0;
+
+    do
+    {
+        if (pDSCB == NULL)
+        {
+            pThis->fEnabledIn = false;
+
+            rc = VERR_NOT_AVAILABLE;
+            break;
+        }
+
+        /* Get DirectSound capture position in bytes. */
+        DWORD cbReadPos;
+        HRESULT hr = IDirectSoundCaptureBuffer_GetCurrentPosition(pDSCB, NULL, &cbReadPos);
+        if (FAILED(hr))
+        {
+            if (hr != pDSoundStrmIn->hrLastCaptureIn)
+            {
+                DSLOGREL(("DSound: Capture GetCurrentPosition %Rhrc\n", hr));
+                pDSoundStrmIn->hrLastCaptureIn = hr;
+            }
+
+            rc = VERR_NOT_AVAILABLE;
+            break;
+        }
+
+        pDSoundStrmIn->hrLastCaptureIn = hr;
+
+        if (cbReadPos & pHstStrmIn->Props.uAlign)
+            DSLOGF(("DSound: Misaligned capture read position %ld (alignment: %RU32)\n", cbReadPos, pHstStrmIn->Props.uAlign));
+
+        /* Capture position in samples. */
+        DWORD csReadPos = cbReadPos >> pHstStrmIn->Props.cShift;
+
+        /* Number of samples available in the DirectSound capture buffer. */
+        DWORD csCaptured = dsoundRingDistance(csReadPos, pDSoundStrmIn->csCaptureReadPos, pDSoundStrmIn->csCaptureBufferSize);
+        if (csCaptured == 0)
+            break;
+
+        /* Using as an intermediate not circular buffer. */
+        AudioMixBufReset(&pHstStrmIn->MixBuf);
+
+        /* Get number of free samples in the mix buffer and check that is has free space */
+        uint32_t csMixFree = AudioMixBufFree(&pHstStrmIn->MixBuf);
+        if (csMixFree == 0)
+        {
+            DSLOGF(("DSound: Capture buffer full\n"));
+            break;
+        }
+
+        DSLOGF(("DSound: Capture csMixFree=%RU32, csReadPos=%ld, csCaptureReadPos=%ld, csCaptured=%ld\n",
+                csMixFree, csReadPos, pDSoundStrmIn->csCaptureReadPos, csCaptured));
+
+        /* No need to fetch more samples than mix buffer can receive. */
+        csCaptured = RT_MIN(csCaptured, csMixFree);
+
+        /* Lock relevant range in the DirectSound capture buffer. */
+        LPVOID pv1, pv2;
+        DWORD cb1, cb2;
+        hr = directSoundCaptureLock(pDSCB, &pHstStrmIn->Props,
+                                    AUDIOMIXBUF_S2B(&pHstStrmIn->MixBuf, pDSoundStrmIn->csCaptureReadPos), /* dwOffset */
+                                    AUDIOMIXBUF_S2B(&pHstStrmIn->MixBuf, csCaptured),                      /* dwBytes */
+                                    &pv1, &pv2, &cb1, &cb2,
+                                    0 /* dwFlags */);
+        if (FAILED(hr))
+        {
+            rc = VERR_ACCESS_DENIED;
+            break;
+        }
+
+        DWORD len1 = AUDIOMIXBUF_B2S(&pHstStrmIn->MixBuf, cb1);
+        DWORD len2 = AUDIOMIXBUF_B2S(&pHstStrmIn->MixBuf, cb2);
+
+        uint32_t csWrittenTotal = 0;
+        uint32_t csWritten;
+        if (pv1 && len1)
+        {
+            rc = AudioMixBufWriteAt(&pHstStrmIn->MixBuf, 0 /* offWrite */,
+                                    pv1, cb1, &csWritten);
+            if (RT_SUCCESS(rc))
+                csWrittenTotal += csWritten;
+        }
+
+        if (   RT_SUCCESS(rc)
+            && csWrittenTotal == len1
+            && pv2 && len2)
+        {
+            rc = AudioMixBufWriteAt(&pHstStrmIn->MixBuf, csWrittenTotal,
+                                    pv2, cb2, &csWritten);
+            if (RT_SUCCESS(rc))
+                csWrittenTotal += csWritten;
+        }
+
+        directSoundCaptureUnlock(pDSCB, pv1, pv2, cb1, cb2);
+
+        if (csWrittenTotal) /* Captured something? */
+            rc = AudioMixBufMixToParent(&pHstStrmIn->MixBuf, csWrittenTotal, &cCaptured);
+
         if (RT_SUCCESS(rc))
-            csWrittenTotal += csWritten;
-    }
-
-    if (   RT_SUCCESS(rc)
-        && csWrittenTotal == len1
-        && pv2 && len2)
-    {
-        rc = AudioMixBufWriteAt(&pHstStrmIn->MixBuf, csWrittenTotal,
-                                pv2, cb2, &csWritten);
-        if (RT_SUCCESS(rc))
-            csWrittenTotal += csWritten;
-    }
-
-    directSoundCaptureUnlock(pDSCB, pv1, pv2, cb1, cb2);
-
-    uint32_t csProcessed = 0;
-    if (csWrittenTotal != 0)
-    {
-        /* Captured something. */
-        rc = AudioMixBufMixToParent(&pHstStrmIn->MixBuf, csWrittenTotal,
-                                    &csProcessed);
-    }
-
-    if (RT_SUCCESS(rc))
-    {
-        pDSoundStrmIn->csCaptureReadPos = (pDSoundStrmIn->csCaptureReadPos + csProcessed) % pDSoundStrmIn->csCaptureBufferSize;
-        DSLOGF(("DSound: Capture %ld (%ld+%ld), processed %RU32/%RU32\n",
-                csCaptured, len1, len2, csProcessed, csWrittenTotal));
-    }
+        {
+            pDSoundStrmIn->csCaptureReadPos = (pDSoundStrmIn->csCaptureReadPos + cCaptured) % pDSoundStrmIn->csCaptureBufferSize;
+            DSLOGF(("DSound: Capture %ld (%ld+%ld), processed %RU32/%RU32\n",
+                    csCaptured, len1, len2, cCaptured, csWrittenTotal));
+        }
+
+    } while (0);
 
     if (pcSamplesCaptured)
-        *pcSamplesCaptured = csProcessed;
+        *pcSamplesCaptured = cCaptured;
 
     return rc;
@@ -1580 +1641 @@
 }
 
+/** @todo Replace PDMAUDIODIR with a (registered? unique) channel ID to provide multi-channel input/output. */
 static DECLCALLBACK(bool) drvHostDSoundIsEnabled(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
 {
-    NOREF(pInterface);
-    NOREF(enmDir);
-    return true; /* Always all enabled. */
+    AssertPtrReturn(pInterface, false);
+
+    PDRVHOSTDSOUND pThis = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
+
+    if (enmDir == PDMAUDIODIR_IN)
+        return pThis->fEnabledIn;
+
+    return pThis->fEnabledOut;
 }
 
 static DECLCALLBACK(int) drvHostDSoundGetConf(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pCfg)
 {
+    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
+    AssertPtrReturn(pCfg,       VERR_INVALID_POINTER);
+
     PDRVHOSTDSOUND pThis = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
-
-    AssertPtrReturn(pCfg, VERR_INVALID_POINTER);
 
     dsoundFreeDeviceLists(pThis);
@@ -1683 +1751 @@
     int rc = RTThreadUserSignal(hThreadSelf);
     AssertRC(rc);
-
-    HRESULT hr;
 
     do
@@ -1727 +1793 @@
                 else if (aEvents[dwObj] == pThis->aEvents[DSOUNDEVENT_OUTPUT])
                 {
-                    DWORD cbPlayPos;
-                    hr = IDirectSoundCaptureBuffer8_GetCurrentPosition(pThis->pStrmOut->pDSB, NULL, &cbPlayPos);
-                    if (SUCCEEDED(hr))
+                    DWORD cbBuffer, cbFree, cbPlayPos;
+                    rc = dsoundGetStatusOut(pThis->pDSStrmOut, &cbBuffer, &cbFree, &cbPlayPos);
+                    if (   RT_SUCCESS(rc)
+                        && cbFree)
                     {
-                        LogFlowFunc(("Output: hr=%Rhrc, dwPlayPos=%ld\n", hr, cbPlayPos));
-
-                        uint32_t cbFree = pThis->pStrmOut->csPlaybackBufferSize - pThis->pStrmOut->cbPlayWritePos;
-
-                        AssertPtr(pThis->pUpIAudioConnector);
-                        pThis->pUpIAudioConnector->pfnCallback(pThis->pUpIAudioConnector, PDMAUDIOCALLBACKTYPE_OUTPUT, &cbFree, sizeof(cbFree));
+                        PDMAUDIOCALLBACKDATAOUT Out;
+                        Out.cbInFree     = cbFree;
+                        Out.cbOutWritten = 0;
+
+                        while (!Out.cbOutWritten)
+                        {
+                            rc = pThis->pUpIAudioConnector->pfnCallback(pThis->pUpIAudioConnector,
+                                                                        PDMAUDIOCALLBACKTYPE_OUTPUT, &Out, sizeof(Out));
+                            if (RT_FAILURE(rc))
+                                break;
+                            RTThreadSleep(100);
+                        }
+
+                        LogFlowFunc(("Output: cbBuffer=%ld, cbFree=%ld, cbPlayPos=%ld, cbWritten=%RU32, rc=%Rrc\n",
+                                     cbBuffer, cbFree, cbPlayPos, Out.cbOutWritten, rc));
                     }
                 }
@@ -1939 +2015 @@
     RTListInit(&pThis->lstDevOutput);
 
+    pThis->fEnabledIn  = false;
+    pThis->fEnabledOut = false;
 #ifdef VBOX_WITH_AUDIO_CALLBACKS
-    pThis->fStopped  = false;
-    pThis->fShutdown = false;
+    pThis->fStopped    = false;
+    pThis->fShutdown   = false;
 
     RT_ZERO(pThis->aEvents);

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

@@ -164 +164 @@
 
     /* Consume as many samples as would be played at the current frequency since last call. */
-    uint32_t csLive          = AudioMixBufAvail(&pHstStrmOut->MixBuf);;
+    uint32_t csLive          = AudioMixBufAvail(&pHstStrmOut->MixBuf);
     uint64_t u64TicksNow     = PDMDrvHlpTMGetVirtualTime(pDrv->pDrvIns);
     uint64_t u64TicksElapsed = u64TicksNow  - pNullStrmOut->u64TicksLast;