Changeset 76157 in vbox for trunk/src/VBox/Devices/Audio/DevIchAc97.cpp

Timestamp:

Dec 11, 2018 10:27:25 AM (6 years ago)

Author:

vboxsync

Message:

Audio/AC97: Optimized stream creation / startup time a lot by re-using the existing mixer / driver chain if the stream's hardware parameters did not change. No need to completely remove and add the same stream again, going through all the PDM interfaces, LUNs and backends.

File:

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

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

@@ -1908 +1908 @@
     int rc = VINF_SUCCESS;
 
-    LogFunc(("[SD%RU8]\n", pStream->u8SD));
-
-    RT_ZERO(pStream->State.Cfg);
-
-    PPDMAUDIOSTREAMCFG pCfg     = &pStream->State.Cfg;
-    PAUDMIXSINK        pMixSink = NULL;
-    AssertCompile(sizeof(pCfg->szName) >= 8);
+    PDMAUDIOSTREAMCFG Cfg;
+    RT_ZERO(Cfg);
+
+    PAUDMIXSINK pMixSink = NULL;
 
     /* Set scheduling hint (if available). */
     if (pThis->uTimerHz)
-        pCfg->Device.uSchedulingHintMs = 1000 /* ms */ / pThis->uTimerHz;
+        Cfg.Device.uSchedulingHintMs = 1000 /* ms */ / pThis->uTimerHz;
+
+    Cfg.Props.cChannels = 2;
+    Cfg.Props.cBytes    = 2 /* 16-bit */;
+    Cfg.Props.fSigned   = true;
+    Cfg.Props.cShift    = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(Cfg.Props.cBytes, Cfg.Props.cChannels);
 
     switch (pStream->u8SD)
@@ -1924 +1926 @@
         case AC97SOUNDSOURCE_PI_INDEX:
         {
-            pCfg->Props.uHz         = ichac97MixerGet(pThis, AC97_PCM_LR_ADC_Rate);
-            pCfg->enmDir            = PDMAUDIODIR_IN;
-            pCfg->DestSource.Source = PDMAUDIORECSOURCE_LINE;
-            pCfg->enmLayout         = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
-            strcpy(pCfg->szName, "Line-In");
-
-            pMixSink                = pThis->pSinkLineIn;
+            Cfg.Props.uHz         = ichac97MixerGet(pThis, AC97_PCM_LR_ADC_Rate);
+            Cfg.enmDir            = PDMAUDIODIR_IN;
+            Cfg.DestSource.Source = PDMAUDIORECSOURCE_LINE;
+            Cfg.enmLayout         = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
+            RTStrCopy(Cfg.szName, sizeof(Cfg.szName), "Line-In");
+
+            pMixSink              = pThis->pSinkLineIn;
             break;
         }
@@ -1936 +1938 @@
         case AC97SOUNDSOURCE_MC_INDEX:
         {
-            pCfg->Props.uHz         = ichac97MixerGet(pThis, AC97_MIC_ADC_Rate);
-            pCfg->enmDir            = PDMAUDIODIR_IN;
-            pCfg->DestSource.Source = PDMAUDIORECSOURCE_MIC;
-            pCfg->enmLayout         = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
-            strcpy(pCfg->szName, "Mic-In");
-
-            pMixSink                = pThis->pSinkMicIn;
+            Cfg.Props.uHz         = ichac97MixerGet(pThis, AC97_MIC_ADC_Rate);
+            Cfg.enmDir            = PDMAUDIODIR_IN;
+            Cfg.DestSource.Source = PDMAUDIORECSOURCE_MIC;
+            Cfg.enmLayout         = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
+            RTStrCopy(Cfg.szName, sizeof(Cfg.szName), "Mic-In");
+
+            pMixSink              = pThis->pSinkMicIn;
             break;
         }
@@ -1948 +1950 @@
         case AC97SOUNDSOURCE_PO_INDEX:
         {
-            pCfg->Props.uHz         = ichac97MixerGet(pThis, AC97_PCM_Front_DAC_Rate);
-            pCfg->enmDir            = PDMAUDIODIR_OUT;
-            pCfg->DestSource.Dest   = PDMAUDIOPLAYBACKDEST_FRONT;
-            pCfg->enmLayout         = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
-            strcpy(pCfg->szName, "Output");
-
-            pMixSink                = pThis->pSinkOut;
+            Cfg.Props.uHz         = ichac97MixerGet(pThis, AC97_PCM_Front_DAC_Rate);
+            Cfg.enmDir            = PDMAUDIODIR_OUT;
+            Cfg.DestSource.Dest   = PDMAUDIOPLAYBACKDEST_FRONT;
+            Cfg.enmLayout         = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
+            RTStrCopy(Cfg.szName, sizeof(Cfg.szName), "Output");
+
+            pMixSink              = pThis->pSinkOut;
             break;
         }
@@ -1965 +1967 @@
     if (RT_SUCCESS(rc))
     {
-        ichac97R3MixerRemoveDrvStreams(pThis, pMixSink, pCfg->enmDir, pCfg->DestSource);
-
-        if (pCfg->Props.uHz)
-        {
-            Assert(pCfg->enmDir != PDMAUDIODIR_UNKNOWN);
-
-            pCfg->Props.cChannels = 2;
-            pCfg->Props.cBytes    = 2 /* 16-bit */;
-            pCfg->Props.fSigned   = true;
-            pCfg->Props.cShift    = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pCfg->Props.cBytes, pCfg->Props.cChannels);
-
-            if (pStream->State.pCircBuf)
+        /* Only (re-)create the stream (and driver chain) if we really have to.
+         * Otherwise avoid this and just reuse it, as this costs performance. */
+        if (!DrvAudioHlpPCMPropsAreEqual(&Cfg.Props, &pStream->State.Cfg.Props))
+        {
+            LogFlowFunc(("[SD%RU8] uHz=%RU32\n", pStream->u8SD, Cfg.Props.uHz));
+
+            if (Cfg.Props.uHz)
             {
-                RTCircBufDestroy(pStream->State.pCircBuf);
-                pStream->State.pCircBuf = NULL;
+                Assert(Cfg.enmDir != PDMAUDIODIR_UNKNOWN);
+
+                if (pStream->State.pCircBuf)
+                {
+                    RTCircBufDestroy(pStream->State.pCircBuf);
+                    pStream->State.pCircBuf = NULL;
+                }
+
+                rc = RTCircBufCreate(&pStream->State.pCircBuf, DrvAudioHlpMilliToBytes(500 /* ms */, &Cfg.Props)); /** @todo Make this configurable. */
+                if (RT_SUCCESS(rc))
+                {
+                    ichac97R3MixerRemoveDrvStreams(pThis, pMixSink, Cfg.enmDir, Cfg.DestSource);
+
+                    rc = ichac97R3MixerAddDrvStreams(pThis, pMixSink, &Cfg);
+                    if (RT_SUCCESS(rc))
+                        rc = DrvAudioHlpStreamCfgCopy(&pStream->State.Cfg, &Cfg);
+                }
             }
-
-            rc = RTCircBufCreate(&pStream->State.pCircBuf, DrvAudioHlpMilliToBytes(500 /* ms */, &pCfg->Props)); /** @todo Make this configurable. */
-            if (RT_SUCCESS(rc))
-                rc = ichac97R3MixerAddDrvStreams(pThis, pMixSink, pCfg);
-        }
+        }
+        else
+            LogFlowFunc(("[SD%RU8] Skipping (re-)creation\n", pStream->u8SD));
     }