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

Timestamp:

Sep 10, 2019 9:01:42 AM (5 years ago)

Author:

vboxsync

Message:

Audio/AC97: Try to relax (EACS VRA / VRM) capabilities / checks to make it more compatible.

File:

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

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

@@ -2536 +2536 @@
 
     /* Configure Extended Audio ID (EAID) + Control & Status (EACS) registers. */
-    uint16_t fEAID = AC97_EAID_REV1; /* Our hardware is AC'97 rev2.3 compliant. */
-    uint16_t fEACS = 0;
-#ifdef VBOX_WITH_AC97_VRA
-    fEAID |= AC97_EAID_VRA; /* Variable Rate PCM Audio capable. */
-    fEACS |= AC97_EACS_VRA; /* Ditto. */
-#endif
-#ifdef VBOX_WITH_AC97_VRM
-    fEAID |= AC97_EAID_VRM; /* Variable Rate Mic-In Audio capable. */
-    fEACS |= AC97_EACS_VRM; /* Ditto. */
-#endif
+    const uint16_t fEAID = AC97_EAID_REV1;                /* Our hardware is AC'97 rev2.3 compliant. */
+    const uint16_t fEACS = AC97_EAID_VRA | AC97_EAID_VRM; /* Variable Rate PCM Audio (VRA) + Mic-In (VRM) capable. */
 
     ichac97MixerSet(pThis, AC97_Extended_Audio_ID,        fEAID);
     ichac97MixerSet(pThis, AC97_Extended_Audio_Ctrl_Stat, fEACS);
-    ichac97MixerSet(pThis, AC97_PCM_Front_DAC_Rate      , 0xbb80);
-    ichac97MixerSet(pThis, AC97_PCM_Surround_DAC_Rate   , 0xbb80);
-    ichac97MixerSet(pThis, AC97_PCM_LFE_DAC_Rate        , 0xbb80);
-    ichac97MixerSet(pThis, AC97_PCM_LR_ADC_Rate         , 0xbb80);
-    ichac97MixerSet(pThis, AC97_MIC_ADC_Rate            , 0xbb80);
+    ichac97MixerSet(pThis, AC97_PCM_Front_DAC_Rate      , 0xbb80 /* 48000 Hz by default */);
+    ichac97MixerSet(pThis, AC97_PCM_Surround_DAC_Rate   , 0xbb80 /* 48000 Hz by default */);
+    ichac97MixerSet(pThis, AC97_PCM_LFE_DAC_Rate        , 0xbb80 /* 48000 Hz by default */);
+    ichac97MixerSet(pThis, AC97_PCM_LR_ADC_Rate         , 0xbb80 /* 48000 Hz by default */);
+    ichac97MixerSet(pThis, AC97_MIC_ADC_Rate            , 0xbb80 /* 48000 Hz by default */);
 
     if (pThis->uCodecModel == AC97_CODEC_AD1980)
@@ -3507 +3499 @@
                      * Handle VRA bits.
                      */
-# ifndef VBOX_WITH_AC97_VRA
-                    if (u32Val & AC97_EACS_VRA)
+                    if (!(u32Val & AC97_EACS_VRA)) /* Check if VRA bit is not set. */
                     {
-                        u32Val &= ~AC97_EACS_VRA; /* Only clear VRA bit and keep the rest. */
-                        LogRel2(("AC97: Variable rate audio (VRA) is not supported, setting to 0x%x\n", u32Val));
+                        ichac97MixerSet(pThis, AC97_PCM_Front_DAC_Rate, 0xbb80); /* Set default (48000 Hz). */
+                        ichac97R3StreamReOpen(pThis, &pThis->aStreams[AC97SOUNDSOURCE_PO_INDEX], true /* fForce */);
+
+                        ichac97MixerSet(pThis, AC97_PCM_LR_ADC_Rate, 0xbb80); /* Set default (48000 Hz). */
+                        ichac97R3StreamReOpen(pThis, &pThis->aStreams[AC97SOUNDSOURCE_PI_INDEX], true /* fForce */);
                     }
-
-                    ichac97MixerSet(pThis, AC97_PCM_Front_DAC_Rate, 0xbb80); /* Set default (48000 Hz). */
-                    ichac97R3StreamReOpen(pThis, &pThis->aStreams[AC97SOUNDSOURCE_PO_INDEX], true /* fForce */);
-
-                    ichac97MixerSet(pThis, AC97_PCM_LR_ADC_Rate, 0xbb80); /* Set default (48000 Hz). */
-                    ichac97R3StreamReOpen(pThis, &pThis->aStreams[AC97SOUNDSOURCE_PI_INDEX], true /* fForce */);
-# else
-#  error            "Implement EACS VRA support!"
-# endif
+                    else
+                        LogRel2(("AC97: Variable rate audio (VRA) is not supported\n"));
+
                     /*
                      * Handle VRM bits.
                      */
-# ifndef VBOX_WITH_AC97_VRM
-                    if (u32Val & AC97_EACS_VRM)
+                    if (!(u32Val & AC97_EACS_VRM)) /* Check if VRM bit is not set. */
                     {
-                        u32Val &= ~AC97_EACS_VRM; /* Only clear VRM bit and keep the rest. */
-                        LogRel2(("AC97: Variable rate microphone audio (VRM) is not supported, setting to 0x%x\n", u32Val));
+                        ichac97MixerSet(pThis, AC97_MIC_ADC_Rate, 0xbb80); /* Set default (48000 Hz). */
+                        ichac97R3StreamReOpen(pThis, &pThis->aStreams[AC97SOUNDSOURCE_MC_INDEX], true /* fForce */);
                     }
-
-                    ichac97MixerSet(pThis, AC97_MIC_ADC_Rate, 0xbb80); /* Set default (48000 Hz). */
-                    ichac97R3StreamReOpen(pThis, &pThis->aStreams[AC97SOUNDSOURCE_MC_INDEX], true /* fForce */);
-# else
-#  error            "Implement EACS VRM support!"
-# endif
+                    else
+                        LogRel2(("AC97: Variable rate microphone audio (VRM) is not supported\n"));
+
                     LogRel2(("AC97: Setting extended audio control to %#x\n", u32Val));
-
                     ichac97MixerSet(pThis, AC97_Extended_Audio_Ctrl_Stat, u32Val);
 #else /* !IN_RING3 */
@@ -3548 +3531 @@
                     if (ichac97MixerGet(pThis, AC97_Extended_Audio_Ctrl_Stat) & AC97_EACS_VRA)
                     {
+                        LogRel2(("AC97: Setting front DAC rate to 0x%x\n", u32Val));
                         ichac97MixerSet(pThis, uPortIdx, u32Val);
-                        LogRel2(("AC97: Setting front DAC rate to 0x%x\n", u32Val));
+                        ichac97R3StreamReOpen(pThis, &pThis->aStreams[AC97SOUNDSOURCE_PO_INDEX], true /* fForce */);
                     }
                     else
                         LogRel2(("AC97: Setting front DAC rate (0x%x) when VRA is not set is forbidden, ignoring\n", u32Val));
-
-                    /* Note: Some guest OSes seem to ignore our codec capabilities (EACS VRA) and try to
-                     *       set the VRA rate nevertheless. So re-open the output stream in any case to avoid
-                     *       breaking playback. */
-                    ichac97R3StreamReOpen(pThis, &pThis->aStreams[AC97SOUNDSOURCE_PO_INDEX], true /* fForce */);
 #else
                     rc = VINF_IOM_R3_IOPORT_WRITE;
@@ -3566 +3545 @@
                     if (ichac97MixerGet(pThis, AC97_Extended_Audio_Ctrl_Stat) & AC97_EACS_VRM)
                     {
+                        LogRel2(("AC97: Setting microphone ADC rate to 0x%x\n", u32Val));
                         ichac97MixerSet(pThis, uPortIdx, u32Val);
-                        LogRel2(("AC97: Setting microphone ADC rate to 0x%x\n", u32Val));
+                        ichac97R3StreamReOpen(pThis, &pThis->aStreams[AC97SOUNDSOURCE_MC_INDEX], true /* fForce */);
                     }
                     else
                         LogRel2(("AC97: Setting microphone ADC rate (0x%x) when VRM is not set is forbidden, ignoring\n",
                                  u32Val));
-
-                    /* Note: Some guest OSes seem to ignore our codec capabilities (EACS VRM) and try to
-                     *       set the VRM rate nevertheless. So re-open the mic-in stream in any case to avoid
-                     *       breaking recording.*/
-                    ichac97R3StreamReOpen(pThis, &pThis->aStreams[AC97SOUNDSOURCE_MC_INDEX], true /* fForce */);
 #else
                     rc = VINF_IOM_R3_IOPORT_WRITE;
@@ -3585 +3560 @@
                     if (ichac97MixerGet(pThis, AC97_Extended_Audio_Ctrl_Stat) & AC97_EACS_VRA)
                     {
+                        LogRel2(("AC97: Setting line-in ADC rate to 0x%x\n", u32Val));
                         ichac97MixerSet(pThis, uPortIdx, u32Val);
-                        LogRel2(("AC97: Setting line-in ADC rate to 0x%x\n", u32Val));
+                        ichac97R3StreamReOpen(pThis, &pThis->aStreams[AC97SOUNDSOURCE_PI_INDEX], true /* fForce */);
                     }
                     else
                         LogRel2(("AC97: Setting line-in ADC rate (0x%x) when VRA is not set is forbidden, ignoring\n", u32Val));
-
-                    /* Note: Some guest OSes seem to ignore our codec capabilities (EACS VRA) and try to
-                     *       set the VRA rate nevertheless. So re-open the line-in stream in any case to avoid
-                     *       breaking recording.*/
-                    ichac97R3StreamReOpen(pThis, &pThis->aStreams[AC97SOUNDSOURCE_PI_INDEX], true /* fForce */);
 #else
                     rc = VINF_IOM_R3_IOPORT_WRITE;