Changeset 73466 in vbox for trunk/src

Timestamp:

Aug 3, 2018 9:41:27 AM (6 years ago)

Author:

vboxsync

Message:

Audio/HDA: Don't add the driver stream in hdaR3Attach() directly via hdaR3MixerAddDrvStream(); instead use hdaR3UpdateStream() so that also the codec gets notified of it.

File:

• trunk/src/VBox/Devices/Audio/DevHDA.cpp (modified) (3 diffs)

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

@@ -362 +362 @@
 static int                        hdaR3AddStream(PHDASTATE pThis, PPDMAUDIOSTREAMCFG pCfg);
 static int                        hdaR3RemoveStream(PHDASTATE pThis, PPDMAUDIOSTREAMCFG pCfg);
+static int                        hdaR3UpdateStream(PHDASTATE pThis, PPDMAUDIOSTREAMCFG pCfg);
 # ifdef HDA_USE_DMA_ACCESS_HANDLER
 static DECLCALLBACK(VBOXSTRICTRC) hdaR3DMAAccessHandler(PVM pVM, PVMCPU pVCpu, RTGCPHYS GCPhys, void *pvPhys,
@@ -2024 +2025 @@
 }
 
+/**
+ * Updates an audio device stream with the given configuration.
+ *
+ * @returns IPRT status code.
+ * @param   pThis               HDA state.
+ * @param   pCfg                Stream configuration to apply.
+ */
+static int hdaR3UpdateStream(PHDASTATE pThis, PPDMAUDIOSTREAMCFG pCfg)
+{
+    /* Remove the old stream from the device setup. */
+    hdaR3RemoveStream(pThis, pCfg);
+
+    /* Add the stream to the device setup. */
+    return hdaR3AddStream(pThis, pCfg);
+}
 #endif /* IN_RING3 */
 
@@ -4529 +4545 @@
         PHDASTREAM pStream = hdaR3GetStreamFromSink(pThis, &pThis->SinkFront);
         if (DrvAudioHlpStreamCfgIsValid(&pStream->State.Cfg))
-            hdaR3MixerAddDrvStream(pThis, pThis->SinkFront.pMixSink,     &pStream->State.Cfg, pDrv);
-
+        {
+            rc2 = hdaR3UpdateStream(pThis, &pStream->State.Cfg);
+            AssertRC(rc2);
+        }
 #ifdef VBOX_WITH_AUDIO_HDA_51_SURROUND
         pStream = hdaR3GetStreamFromSink(pThis, &pThis->SinkCenterLFE);
         if (DrvAudioHlpStreamCfgIsValid(&pStream->State.Cfg))
-            hdaR3MixerAddDrvStream(pThis, pThis->SinkCenterLFE.pMixSink, &pStream->State.Cfg, pDrv);
+        {
+            rc2 = hdaR3UpdateStream(pThis, &pStream->State.Cfg);
+            AssertRC(rc2);
+        }
 
         pStream = hdaR3GetStreamFromSink(pThis, &pThis->SinkRear);
         if (DrvAudioHlpStreamCfgIsValid(&pStream->State.Cfg))
-            hdaR3MixerAddDrvStream(pThis, pThis->SinkRear.pMixSink,      &pStream->State.Cfg, pDrv);
+        {
+            rc2 = hdaR3UpdateStream(pThis, &pStream->State.Cfg);
+            AssertRC(rc2);
+        }
 #endif
         pStream = hdaR3GetStreamFromSink(pThis, &pThis->SinkLineIn);
         if (DrvAudioHlpStreamCfgIsValid(&pStream->State.Cfg))
-            hdaR3MixerAddDrvStream(pThis, pThis->SinkLineIn.pMixSink,    &pStream->State.Cfg, pDrv);
+        {
+            rc2 = hdaR3UpdateStream(pThis, &pStream->State.Cfg);
+            AssertRC(rc2);
+        }
 
 #ifdef VBOX_WITH_AUDIO_HDA_MIC_IN
         pStream = hdaR3GetStreamFromSink(pThis, &pThis->SinkMicIn);
         if (DrvAudioHlpStreamCfgIsValid(&pStream->State.Cfg))
-            hdaR3MixerAddDrvStream(pThis, pThis->SinkMicIn.pMixSink,     &pStream->State.Cfg, pDrv);
+        {
+            rc2 = hdaR3UpdateStream(pThis, &pStream->State.Cfg);
+            AssertRC(rc2);
+        }
 #endif
     }