Changeset 73569 in vbox for trunk/src/VBox

Timestamp:

Aug 8, 2018 3:20:23 PM (7 years ago)

Author:

vboxsync

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

124206

Message:

Audio/DrvAudio: Use capturing mixing buffers the same way as the playback ones: The child buffer (host side) is being used as intermediate buffer for conversion, whereas the parent buffer (guest side) will act as the actual ring buffer for the device emulation. For playback it's the other way around.

File:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (modified) (10 diffs)

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

@@ -1123 +1123 @@
     do
     {
-        uint32_t cfMixed = 0;
-
         rc = pThis->pHostDrvAudio->pfnStreamIterate(pThis->pHostDrvAudio, pStream->pvBackend);
         if (RT_FAILURE(rc))
             break;
 
-        if (pStream->enmDir == PDMAUDIODIR_IN)
-        {
-            /* Has the host captured any frames which were not mixed to the guest side yet? */
-            uint32_t cfCaptured = AudioMixBufUsed(&pStream->Host.MixBuf);
-            if (cfCaptured)
-            {
-                /* When capturing frames, the guest is the parent while the host is the child.
-                 * So try mixing not yet mixed host-side frames to the guest-side buffer. */
-                rc = AudioMixBufMixToParent(&pStream->Host.MixBuf, cfCaptured, &cfMixed);
-                if (RT_FAILURE(rc))
-                {
-                    if (rc == VERR_BUFFER_OVERFLOW)
-                        LogRel2(("Audio: Guest input stream '%s' full\n", pStream->szName));
-                    else
-                        LogRel2(("Audio: Mixing to guest input stream '%s' failed: %Rrc\n", pStream->szName, rc));
-#ifdef DEBUG_andy_disabled
-                    AssertFailed();
-#endif
-                }
-
-#ifdef VBOX_WITH_STATISTICS
-                STAM_COUNTER_ADD(&pThis->Stats.TotalFramesMixedIn, cfMixed);
-                Assert(cfCaptured >= cfMixed);
-                STAM_COUNTER_ADD(&pThis->Stats.TotalFramesLostIn,  cfCaptured - cfMixed);
-#endif
-                Log3Func(("[%s] %RU32/%RU32 input frames mixed, rc=%Rrc\n", pStream->szName, cfMixed, cfCaptured, rc));
-            }
-            else
-            {
-                /* No audio frames to transfer host to the guest (anymore)?
-                 * Then try closing this stream if marked so in the next block. */
-                fTryClosePending = true;
-            }
-        }
-        else if (pStream->enmDir == PDMAUDIODIR_OUT)
+        if (pStream->enmDir == PDMAUDIODIR_OUT)
         {
             /* No audio frames to transfer from guest to host (anymore)?
@@ -1171 +1135 @@
             Log3Func(("[%s] fTryClosePending=%RTbool, cfLive=%RU32\n", pStream->szName, fTryClosePending, cfLive));
         }
-        else
-            AssertFailedStmt(rc = VERR_NOT_IMPLEMENTED);
 
         /* Has the host stream marked as pending to disable?
@@ -1666 +1628 @@
         else if (cbCaptured)
         {
-            if (pThis->In.Cfg.Dbg.fEnabled)
-                DrvAudioHlpFileWrite(pStream->In.Dbg.pFileCaptureNonInterleaved, auBuf, cbCaptured, 0 /* fFlags */);
-
             Assert(cbCaptured <= cbBuf);
             if (cbCaptured > cbBuf) /* Paranoia. */
                 cbCaptured = (uint32_t)cbBuf;
 
-            uint32_t cfCaptured = 0;
-            rc = AudioMixBufWriteCirc(&pStream->Host.MixBuf, auBuf, cbCaptured, &cfCaptured);
-            if (RT_SUCCESS(rc))
-                cfCapturedTotal += cfCaptured;
+            /* We use the host side mixing buffer as an intermediate buffer to do some
+             * (first) processing (if needed), so always write the incoming data at offset 0. */
+            uint32_t cfHstWritten = 0;
+            rc = AudioMixBufWriteAt(&pStream->Host.MixBuf, 0 /* offFrames */, auBuf, cbCaptured, &cfHstWritten);
+            if (   RT_FAILURE(rc)
+                || !cfHstWritten)
+            {
+                AssertMsgFailed(("[%s] Write failed: cbCaptured=%RU32, cfHstWritten=%RU32, rc=%Rrc\n",
+                                 pStream->szName, cbCaptured, cfHstWritten, rc));
+                break;
+            }
+
+            if (pThis->In.Cfg.Dbg.fEnabled)
+                DrvAudioHlpFileWrite(pStream->In.Dbg.pFileCaptureNonInterleaved, auBuf, cbCaptured, 0 /* fFlags */);
+
+            uint32_t cfHstMixed = 0;
+            if (cfHstWritten)
+            {
+                int rc2 = AudioMixBufMixToParentEx(&pStream->Host.MixBuf, 0 /* cSrcOffset */, cfHstWritten /* cSrcFrames */,
+                                                   &cfHstMixed /* pcSrcMixed */);
+                Log3Func(("[%s] cbCaptured=%RU32, cfWritten=%RU32, cfMixed=%RU32, rc=%Rrc\n",
+                          pStream->szName, cbCaptured, cfHstWritten, cfHstMixed, rc2));
+                AssertRC(rc2);
+            }
+
+            cfCapturedTotal += cfHstMixed;
         }
         else /* Nothing captured -- bail out. */
@@ -1799 +1780 @@
     uint32_t cfCaptured = 0;
 
+#ifdef LOG_ENABLED
+    char *pszStreamSts = dbgAudioStreamStatusToStr(pStream->fStatus);
+    Log3Func(("[%s] fStatus=%s\n", pStream->szName, pszStreamSts));
+    RTStrFree(pszStreamSts);
+#endif /* LOG_ENABLED */
+
     do
     {
         if (!pThis->pHostDrvAudio)
+        {
+            rc = VERR_AUDIO_STREAM_NOT_READY;
             break;
-
-        /*
-         * Check if the backend is ready to operate.
-         */
-
-        PDMAUDIOSTREAMSTS stsStream = pStream->fStatus;
-#ifdef LOG_ENABLED
-        char *pszStreamSts = dbgAudioStreamStatusToStr(stsStream);
-        Log3Func(("[%s] Start: fStatus=%s\n", pStream->szName, pszStreamSts));
-        RTStrFree(pszStreamSts);
-#endif /* LOG_ENABLED */
-        if (!(stsStream & PDMAUDIOSTREAMSTS_FLAG_ENABLED)) /* Stream disabled? Bail out. */
+        }
+
+        if (   !pThis->In.fEnabled
+            || !DrvAudioHlpStreamStatusCanRead(pStream->fStatus))
+        {
+            rc = VERR_AUDIO_STREAM_NOT_READY;
             break;
+        }
 
         /*
@@ -1838 +1822 @@
             pThis->pHostDrvAudio->pfnStreamCaptureEnd(pThis->pHostDrvAudio, pStream->pvBackend);
 
-#ifdef LOG_ENABLED
-        pszStreamSts = dbgAudioStreamStatusToStr(stsStream);
-        Log3Func(("[%s] End: fStatus=%s, cfCaptured=%RU32, rc=%Rrc\n",
-                  pStream->szName, pszStreamSts, cfCaptured, rc));
-        RTStrFree(pszStreamSts);
-#endif /* LOG_ENABLED */
-
         if (RT_SUCCESS(rc))
         {
@@ -1850 +1827 @@
 
 #ifdef VBOX_WITH_STATISTICS
-            STAM_COUNTER_ADD(&pThis->Stats.TotalFramesIn,        cfCaptured);
+            STAM_COUNTER_ADD(&pThis->Stats.TotalFramesIn,       cfCaptured);
             STAM_COUNTER_ADD(&pStream->In.Stats.FramesCaptured, cfCaptured);
 #endif
@@ -2318 +2295 @@
     do
     {
-        if (!pThis->In.fEnabled)
-        {
-            /* If the stream is not enabled, return silence. */
-            DrvAudioHlpClearBuf(&pStream->Guest.Cfg.Props, pvBuf, cbBuf,
-                                PDMAUDIOPCMPROPS_B2F(&pStream->Guest.Cfg.Props, cbBuf));
-            cbReadTotal = cbBuf;
+        if (   !pThis->In.fEnabled
+            || !DrvAudioHlpStreamStatusCanRead(pStream->fStatus))
+        {
+            rc = VERR_AUDIO_STREAM_NOT_READY;
             break;
         }
@@ -2331 +2306 @@
             && pThis->pHostDrvAudio->pfnGetStatus(pThis->pHostDrvAudio, PDMAUDIODIR_IN) != PDMAUDIOBACKENDSTS_RUNNING)
         {
-            rc = VERR_NOT_AVAILABLE;
+            rc = VERR_AUDIO_STREAM_NOT_READY;
             break;
         }
@@ -2341 +2316 @@
         uint32_t cfReadTotal = 0;
 
-        uint32_t cfToRead = RT_MIN(AUDIOMIXBUF_B2F(&pStream->Guest.MixBuf, cbBuf), AudioMixBufUsed(&pStream->Guest.MixBuf));
+        uint32_t cfToRead = RT_MIN(AUDIOMIXBUF_B2F(&pStream->Guest.MixBuf, cbBuf), AudioMixBufLive(&pStream->Guest.MixBuf));
         while (cfToRead)
         {
@@ -2772 +2747 @@
     AssertMsg(pStream->enmDir == PDMAUDIODIR_IN, ("Can't read from a non-input stream\n"));
 
-    const uint32_t cfReadable = AudioMixBufLive(&pStream->Guest.MixBuf);
-
-    Log3Func(("[%s] cfReadable=%RU32 (%zu bytes)\n", pStream->szName, cfReadable,
-              AUDIOMIXBUF_F2B(&pStream->Guest.MixBuf, cfReadable)));
-
-    uint32_t cbReadable = AUDIOMIXBUF_F2B(&pStream->Guest.MixBuf, cfReadable);
+    uint32_t cbReadable = 0;
+
+    if (DrvAudioHlpStreamStatusCanRead(pStream->fStatus))
+    {
+        const uint32_t cfReadable = AudioMixBufLive(&pStream->Guest.MixBuf);
+
+        Log3Func(("[%s] cfReadable=%RU32 (%zu bytes)\n", pStream->szName, cfReadable,
+                  AUDIOMIXBUF_F2B(&pStream->Guest.MixBuf, cfReadable)));
+
+        cbReadable = AUDIOMIXBUF_F2B(&pStream->Guest.MixBuf, cfReadable);
+    }
 
     rc2 = RTCritSectLeave(&pThis->CritSect);