Changeset 55430 in vbox for trunk/src/VBox/Devices

Timestamp:

Apr 24, 2015 3:53:15 PM (10 years ago)

Author:

vboxsync

Message:

AC97: Take 12dB volume offset used in some controls into account.

File:

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

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

@@ -49 +49 @@
 *******************************************************************************/
 #undef LOG_VOICES
-#ifndef VBOX
-//#define USE_MIXER
-#else
-# define USE_MIXER
-#endif
 
 #ifdef DEBUG
@@ -835 +830 @@
 }
 
-#ifdef USE_MIXER
-
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
 static void ichac97SetVolume(PAC97STATE pThis, int index, PDMAUDIOMIXERCTL mt, uint32_t val)
@@ -846 +839 @@
     uint8_t rvol = val & VOL_MASK;
     uint8_t lvol = (val >> 8) & VOL_MASK;
+
+    /* For the master volume, 0 corresponds to 0dB gain. But for the other
+     * volume controls, 0 corresponds to +12dB and 8 to 0dB. */
+    if (mt != PDMAUDIOMIXERCTL_VOLUME)
+    {
+        /* NB: Currently there is no gain support, only attenuation. */
+        lvol = lvol < 8 ? 0 : lvol - 8;
+        rvol = rvol < 8 ? 0 : rvol - 8;
+    }
+
     /* AC'97 has 1.5dB steps; we use 0.375dB steps. */
     rvol = 255 - rvol * 4;
@@ -957 +960 @@
 }
 
-#endif /* USE_MIXER */
-
 static void ichac97MixerReset(PAC97STATE pThis)
 {
@@ -1046 +1047 @@
         ichac97MixerStore(pThis, AC97_Vendor_ID2              , 0x7600); /* 7608 */
     }
-#ifdef USE_MIXER
     ichac97RecordSelect(pThis, 0);
 # ifdef VBOX_WITH_PDM_AUDIO_DRIVER
@@ -1057 +1057 @@
     ichac97SetVolume(pThis, AC97_Line_In_Volume_Mute, AUD_MIXER_LINE_IN, 0x8808);
 # endif
-#else
-    ichac97MixerStore(pThis, AC97_Record_Select, 0);
-    ichac97MixerStore(pThis, AC97_Master_Volume_Mute,  0x8000);
-    ichac97MixerStore(pThis, AC97_PCM_Out_Volume_Mute, 0x8808);
-    ichac97MixerStore(pThis, AC97_Line_In_Volume_Mute, 0x8808);
-#endif
 
     /* Reset all streams. */
@@ -1916 +1910 @@
                     ichac97MixerStore(pThis, index, u32);
                     break;
-#ifdef USE_MIXER
                 case AC97_Master_Volume_Mute:
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
@@ -1941 +1934 @@
                     ichac97RecordSelect(pThis, u32);
                     break;
-#else  /* !USE_MIXER */
-                case AC97_Master_Volume_Mute:
-                case AC97_PCM_Out_Volume_Mute:
-                case AC97_Line_In_Volume_Mute:
-                case AC97_Record_Select:
-                    ichac97MixerStore(pThis, index, u32);
-                    break;
-#endif /* !USE_MIXER */
                 case AC97_Vendor_ID1:
                 case AC97_Vendor_ID2:
@@ -2140 +2125 @@
     SSMR3GetMem(pSSM, active, sizeof(active));
 
-#ifdef USE_MIXER
     ichac97RecordSelect(pThis, ichac97MixerLoad(pThis, AC97_Record_Select));
 # define V_(a, b) ichac97SetVolume(pThis, a, b, ichac97MixerLoad(pThis, a))
@@ -2153 +2137 @@
 # endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 # undef V_
-#endif /* USE_MIXER */
     ichac97ResetStreams(pThis, active);