Changeset 73626 in vbox for trunk/src/VBox

Timestamp:

Aug 12, 2018 3:57:34 PM (6 years ago)

Author:

vboxsync

Message:

Audio/AC97: Made the stream's circular buffer size based on the current stream format (and not some random value).

File:

• trunk/src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (4 diffs)

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

@@ -945 +945 @@
 
     int rc = RTCritSectInit(&pStream->State.CritSect);
-    if (RT_SUCCESS(rc))
-        rc = RTCircBufCreate(&pStream->State.pCircBuf, _4K); /** @todo Make this configurable. */
 
     pStream->Dbg.Runtime.fEnabled = pThis->Dbg.fEnabled;
@@ -997 +995 @@
     LogFlowFunc(("[SD%RU8]\n", pStream->u8SD));
 
+    ichac97R3StreamClose(pThis, pStream);
+
     int rc2 = RTCritSectDelete(&pStream->State.CritSect);
     AssertRC(rc2);
-
-    if (pStream->State.pCircBuf)
-    {
-        RTCircBufDestroy(pStream->State.pCircBuf);
-        pStream->State.pCircBuf = NULL;
-    }
 
 # ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
@@ -1862 +1856 @@
             pCfg->Props.cShift    = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pCfg->Props.cBytes, pCfg->Props.cChannels);
 
-            rc = ichac97R3MixerAddDrvStreams(pThis, pMixSink, pCfg);
+            rc = RTCircBufCreate(&pStream->State.pCircBuf, DrvAudioHlpMilliToBytes(100 /* ms */, &pCfg->Props)); /** @todo Make this configurable. */
+            if (RT_SUCCESS(rc))
+                rc = ichac97R3MixerAddDrvStreams(pThis, pMixSink, pCfg);
         }
     }
@@ -1880 +1876 @@
 {
     RT_NOREF(pThis);
-    RT_NOREF(pStream);
 
     LogFlowFunc(("[SD%RU8]\n", pStream->u8SD));
+
+    if (pStream->State.pCircBuf)
+    {
+        RTCircBufDestroy(pStream->State.pCircBuf);
+        pStream->State.pCircBuf = NULL;
+    }
 
     return VINF_SUCCESS;