Changeset 88443 in vbox

Timestamp:

Apr 9, 2021 5:21:32 PM (4 years ago)

Author:

vboxsync

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

143695

Message:

DrvAudio: Don't try set volume on output streams when adding them. Don't bother iterating streams when we've got zero bytes to push during mixer update. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/AudioMixer.cpp (modified) (2 diffs)

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

@@ -525 +525 @@
     }
 
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(rc) && pSink->enmDir != AUDMIXSINKDIR_OUTPUT)
     {
         /* Apply the sink's combined volume to the stream. */
@@ -1810 +1810 @@
               AudioMixBufLive(&pSink->MixBuf), cFramesToRead, cWritableStreams));
 
-    if (cWritableStreams)
-    {
-        /*
-         * For each of the enabled streams, convert cFramesToRead frames from
-         * the mixing buffer and write that to the downstream driver.
-         */
-        RTListForEach(&pSink->lstStreams, pMixStream, AUDMIXSTREAM, Node)
-        {
-            if (pMixStream->fStatus & AUDMIXSTREAM_STATUS_ENABLED)
+    if (cWritableStreams > 0)
+    {
+        if (cFramesToRead > 0)
+        {
+            /*
+             * For each of the enabled streams, convert cFramesToRead frames from
+             * the mixing buffer and write that to the downstream driver.
+             */
+            RTListForEach(&pSink->lstStreams, pMixStream, AUDMIXSTREAM, Node)
             {
-                uint32_t offSrcFrame = 0;
-                do
+                if (pMixStream->fStatus & AUDMIXSTREAM_STATUS_ENABLED)
                 {
-                    /* Convert a chunk from the mixer buffer.  */
-                    union
+                    uint32_t offSrcFrame = 0;
+                    do
                     {
-                        uint8_t  ab[8192];
-                        uint64_t au64[8192 / sizeof(uint64_t)]; /* Use uint64_t to ensure good alignment. */
-                    } Buf;
-                    uint32_t cbDstPeeked      = sizeof(Buf);
-                    uint32_t cSrcFramesPeeked = cFramesToRead - offSrcFrame;
-                    AudioMixBufPeek(&pSink->MixBuf, offSrcFrame, cSrcFramesPeeked, &cSrcFramesPeeked,
-                                    &pMixStream->PeekState, &Buf, sizeof(Buf), &cbDstPeeked);
-                    offSrcFrame += cSrcFramesPeeked;
-
-                    /* Write it to the backend.  Since've checked that there is buffer
-                       space available, this should always write the whole buffer. */
-                    uint32_t cbDstWritten = 0;
-                    int rc2 = pMixStream->pConn->pfnStreamWrite(pMixStream->pConn, pMixStream->pStream,
-                                                                &Buf, cbDstPeeked, &cbDstWritten);
-                    Log3Func(("%s: %#x L %#x => %#x bytes; wrote %#x rc2=%Rrc %s\n", pSink->pszName, offSrcFrame,
-                              cSrcFramesPeeked - cSrcFramesPeeked, cbDstPeeked, cbDstWritten, rc2, pMixStream->pszName));
-                    if (RT_SUCCESS(rc2))
-                        AssertLogRelMsg(cbDstWritten == cbDstPeeked,
-                                        ("cbDstWritten=%#x cbDstPeeked=%#x - (sink '%s')\n",
-                                         cbDstWritten, cbDstPeeked, pSink->pszName));
-                    else if (rc2 == VERR_AUDIO_STREAM_NOT_READY)
-                    {
-                        LogRel2(("Audio Mixer: '%s' (sink '%s'): Stream not ready - skipping.\n", pMixStream->pszName, pSink->pszName));
-                        break; /* must've changed status, stop processing */
-                    }
-                    else
-                    {
-                        Assert(rc2 != VERR_BUFFER_OVERFLOW);
-                        LogRel2(("Audio Mixer: Writing to mixer stream '%s' (sink '%s') failed, rc=%Rrc\n",
-                                 pMixStream->pszName, pSink->pszName, rc2));
-                        break;
-                    }
-                } while (offSrcFrame < cFramesToRead);
-                Assert(offSrcFrame == cFramesToRead);
+                        /* Convert a chunk from the mixer buffer.  */
+                        union
+                        {
+                            uint8_t  ab[8192];
+                            uint64_t au64[8192 / sizeof(uint64_t)]; /* Use uint64_t to ensure good alignment. */
+                        } Buf;
+                        uint32_t cbDstPeeked      = sizeof(Buf);
+                        uint32_t cSrcFramesPeeked = cFramesToRead - offSrcFrame;
+                        AudioMixBufPeek(&pSink->MixBuf, offSrcFrame, cSrcFramesPeeked, &cSrcFramesPeeked,
+                                        &pMixStream->PeekState, &Buf, sizeof(Buf), &cbDstPeeked);
+                        offSrcFrame += cSrcFramesPeeked;
+
+                        /* Write it to the backend.  Since've checked that there is buffer
+                           space available, this should always write the whole buffer. */
+                        uint32_t cbDstWritten = 0;
+                        int rc2 = pMixStream->pConn->pfnStreamWrite(pMixStream->pConn, pMixStream->pStream,
+                                                                    &Buf, cbDstPeeked, &cbDstWritten);
+                        Log3Func(("%s: %#x L %#x => %#x bytes; wrote %#x rc2=%Rrc %s\n", pSink->pszName, offSrcFrame,
+                                  cSrcFramesPeeked - cSrcFramesPeeked, cbDstPeeked, cbDstWritten, rc2, pMixStream->pszName));
+                        if (RT_SUCCESS(rc2))
+                            AssertLogRelMsg(cbDstWritten == cbDstPeeked,
+                                            ("cbDstWritten=%#x cbDstPeeked=%#x - (sink '%s')\n",
+                                             cbDstWritten, cbDstPeeked, pSink->pszName));
+                        else if (rc2 == VERR_AUDIO_STREAM_NOT_READY)
+                        {
+                            LogRel2(("Audio Mixer: '%s' (sink '%s'): Stream not ready - skipping.\n",
+                                     pMixStream->pszName, pSink->pszName));
+                            break; /* must've changed status, stop processing */
+                        }
+                        else
+                        {
+                            Assert(rc2 != VERR_BUFFER_OVERFLOW);
+                            LogRel2(("Audio Mixer: Writing to mixer stream '%s' (sink '%s') failed, rc=%Rrc\n",
+                                     pMixStream->pszName, pSink->pszName, rc2));
+                            break;
+                        }
+                    } while (offSrcFrame < cFramesToRead);
+                }
             }
-        }
-
-        AudioMixBufAdvance(&pSink->MixBuf, cFramesToRead);
+
+            AudioMixBufAdvance(&pSink->MixBuf, cFramesToRead);
+        }
 
         /*