Changeset 70975 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Feb 12, 2018 4:42:51 PM (7 years ago)

Author:

vboxsync

Message:

Audio/HDA: Disable audio streams before doing a stream reset in hdaGCTLReset().

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHDA.cpp (modified) (1 diff)
• HDAStream.cpp (modified) (1 diff)

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

@@ -3039 +3039 @@
     for (uint8_t uSD = 0; uSD < HDA_MAX_STREAMS; ++uSD)
     {
-        /* Remove the RUN bit from SDnCTL in case the stream was in a running state before. */
-        HDA_STREAM_REG(pThis, CTL, uSD) &= ~HDA_SDCTL_RUN;
-        hdaStreamReset(pThis, &pThis->aStreams[uSD], uSD);
+        int rc2 = hdaStreamEnable(&pThis->aStreams[uSD], false /* fEnable */);
+        if (RT_SUCCESS(rc2))
+        {
+            /* Remove the RUN bit from SDnCTL in case the stream was in a running state before. */
+            HDA_STREAM_REG(pThis, CTL, uSD) &= ~HDA_SDCTL_RUN;
+            hdaStreamReset(pThis, &pThis->aStreams[uSD], uSD);
+        }
     }
 

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

@@ -504 +504 @@
     int rc = VINF_SUCCESS;
 
-    if (!pStream->pMixSink) /* Stream attached to a sink? */
-    {
-        AssertMsgFailed(("Stream #%RU8 not has no mixer sink attached\n", pStream->u8SD));
-        return VERR_WRONG_ORDER;
-    }
-
     AUDMIXSINKCMD enmCmd = fEnable
                          ? AUDMIXSINKCMD_ENABLE : AUDMIXSINKCMD_DISABLE;
 
     /* First, enable or disable the stream and the stream's sink, if any. */
-    if (pStream->pMixSink->pMixSink)
+    if (   pStream->pMixSink
+        && pStream->pMixSink->pMixSink)
         rc = AudioMixerSinkCtl(pStream->pMixSink->pMixSink, enmCmd);
 
     if (   RT_SUCCESS(rc)
+        && fEnable
         && pStream->Dbg.Runtime.fEnabled)
     {