Changeset 55394 in vbox

Timestamp:

Apr 22, 2015 10:26:00 PM (10 years ago)

Author:

vboxsync

Message:

Audio: Volume handling rework (see #5964).

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixBuffer.cpp (modified) (2 diffs)
• DevIchAc97.cpp (modified) (1 diff)
• DevIchHdaCodec.cpp (modified) (1 diff)
• DevSB16.cpp (modified) (5 diffs)

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

@@ -57 +57 @@
 # endif
 #endif
+
+
+/*
+ *   Soft Volume Control
+ *
+ * The external code supplies an 8-bit volume (attenuation) value in the
+ * 0 .. 255 range. This represents 0 to -96dB attenuation where an input
+ * value of 0 corresponds to -96dB and 255 corresponds to 0dB (unchanged).
+ *
+ * Each step thus correspons to 96 / 256 or 0.375dB. Every 6dB (16 steps)
+ * represents doubling the sample value.
+ *
+ * For internal use, the volume control needs to be converted to a 16-bit
+ * (sort of) exponential value between 1 and 65536. This is used with fixed
+ * point arithmetic such that 65536 means 1.0 and 1 means 1/65536.
+ *
+ * For actual volume calculation, 33.31 fixed point is used. Maximum (or
+ * unattenuated) volume is represented as 0x80000000; conveniently, this
+ * value fits into a uint32_t.
+ */
+
+
+/**   Logarithmic/exponential volume conversion table. */
+uint32_t aVolumeConv[256] = {
+        1,     1,     1,     1,     1,     1,     1,     1, /*   7 */
+        1,     2,     2,     2,     2,     2,     2,     2, /*  15 */
+        2,     2,     2,     2,     2,     3,     3,     3, /*  23 */
+        3,     3,     3,     3,     4,     4,     4,     4, /*  31 */
+        4,     4,     5,     5,     5,     5,     5,     6, /*  39 */
+        6,     6,     6,     7,     7,     7,     8,     8, /*  47 */
+        8,     9,     9,    10,    10,    10,    11,    11, /*  55 */
+       12,    12,    13,    13,    14,    15,    15,    16, /*  63 */
+       17,    17,    18,    19,    20,    21,    22,    23, /*  71 */
+       24,    25,    26,    27,    28,    29,    31,    32, /*  79 */
+       33,    35,    36,    38,    40,    41,    43,    45, /*  87 */
+       47,    49,    52,    54,    56,    59,    61,    64, /*  95 */
+       67,    70,    73,    76,    79,    83,    87,    91, /* 103 */
+       95,    99,   103,   108,   112,   117,   123,   128, /* 111 */
+      134,   140,   146,   152,   159,   166,   173,   181, /* 119 */
+      189,   197,   206,   215,   225,   235,   245,   256, /* 127 */
+      267,   279,   292,   304,   318,   332,   347,   362, /* 135 */
+      378,   395,   412,   431,   450,   470,   490,   512, /* 143 */
+      535,   558,   583,   609,   636,   664,   693,   724, /* 151 */
+      756,   790,   825,   861,   899,   939,   981,  1024, /* 159 */
+     1069,  1117,  1166,  1218,  1272,  1328,  1387,  1448, /* 167 */
+     1512,  1579,  1649,  1722,  1798,  1878,  1961,  2048, /* 175 */
+     2139,  2233,  2332,  2435,  2543,  2656,  2774,  2896, /* 183 */
+     3025,  3158,  3298,  3444,  3597,  3756,  3922,  4096, /* 191 */
+     4277,  4467,  4664,  4871,  5087,  5312,  5547,  5793, /* 199 */
+     6049,  6317,  6597,  6889,  7194,  7512,  7845,  8192, /* 207 */
+     8555,  8933,  9329,  9742, 10173, 10624, 11094, 11585, /* 215 */
+    12098, 12634, 13193, 13777, 14387, 15024, 15689, 16384, /* 223 */
+    17109, 17867, 18658, 19484, 20347, 21247, 22188, 23170, /* 231 */
+    24196, 25268, 26386, 27554, 28774, 30048, 31379, 32768, /* 239 */
+    34219, 35734, 37316, 38968, 40693, 42495, 44376, 46341, /* 247 */
+    48393, 50535, 52773, 55109, 57549, 60097, 62757, 65536, /* 255 */
+};
 
 /**
@@ -1141 +1198 @@
     pMixBuf->Volume.uLeft  = (UINT64_C(0x80000000) * pVol->uLeft) / 255;
     pMixBuf->Volume.uRight = (UINT64_C(0x80000000) * pVol->uRight) / 255;
+    //@todo: Ensure that the input is in the correct range/initialized!
+    pMixBuf->Volume.uLeft  = aVolumeConv[pVol->uLeft  & 0xFF] * UINT64_C(0x8000);
+    pMixBuf->Volume.uRight = aVolumeConv[pVol->uRight & 0xFF] * UINT64_C(0x8000);
 
     LogFlowFunc(("\t-> lVol=%RU32, rVol=%RU32\n", pMixBuf->Volume.uLeft, pMixBuf->Volume.uRight));

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

@@ -844 +844 @@
 {
     int mute = (val >> MUTE_SHIFT) & 1;
-    uint8_t rvol = VOL_MASK - (val & VOL_MASK);
-    uint8_t lvol = VOL_MASK - ((val >> 8) & VOL_MASK);
-    rvol = 255 * rvol / VOL_MASK;
-    lvol = 255 * lvol / VOL_MASK;
-
-    LogFunc(("mt=%ld, val=%RU32, mute=%RTbool\n", mt, val, RT_BOOL(mute)));
+    uint8_t rvol = val & VOL_MASK;
+    uint8_t lvol = (val >> 8) & VOL_MASK;
+    /* AC'97 has 1.5dB steps; we use 0.375dB steps. */
+    rvol = 255 - rvol * 4;
+    lvol = 255 - lvol * 4;
+
+    LogFunc(("mt=%ld, val=%RX32, mute=%RTbool\n", mt, val, RT_BOOL(mute)));
 
 #ifdef SOFT_VOLUME

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

@@ -1205 +1205 @@
 
     /* The STAC9220 volume controls have 0 to -96dB attenuation range in 128 steps.
-     * We have 0 to -48dB range in 256 steps. HDA volume setting of 127 must map
-     * to 255 internally (0dB), while HDA volume setting of 63 (-48dB) and below
-     * should map  to 1 (rather than zero) internally.
+     * We have 0 to -96dB range in 256 steps. HDA volume setting of 127 must map
+     * to 255 internally (0dB), while HDA volume setting of 0 (-96dB) should map
+     * to 1 (rather than zero) internally.
      */
-    if (lVol > 63)
-        lVol = (lVol - 63) * (4 * 255) / 256;
-    else
-        lVol = 1;   /* Not quite zero. */
-
-    if (rVol > 63)
-        rVol = (rVol - 63) * (4 * 255) / 256;
-    else
-        rVol = 1;   /* Not quite zero. */
+    lVol = (lVol + 1) * (2 * 255) / 256;
+    rVol = (rVol + 1) * (2 * 255) / 256;
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER

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

@@ -1057 +1057 @@
 }
 
+static uint8_t sb16MixRegToVol(PSB16STATE pThis, int reg)
+{
+    /* The SB16 mixer has a 0 to -62dB range in 32 levels (2dB each step).
+     * We use a 0 to -96dB range in 256 levels (0.375dB each step).
+     * Only the top 5 bits of a mixer register are used.
+     */
+    uint8_t steps = 31 - (pThis->mixer_regs[reg] >> 3);
+    uint8_t vol   = 255 - steps * 16 / 3;   /* (2dB*8) / (0.375dB*8) */
+    return vol;
+}
+
+static void sb16SetMasterVolume(PSB16STATE pThis)
+{
+    int     mute = 0; /** @todo Handle (un)muting. */
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    uint8_t lvol = sb16MixRegToVol(pThis, 0x30);
+    uint8_t rvol = sb16MixRegToVol(pThis, 0x31);
+    PDMAUDIOVOLUME vol = { RT_BOOL(mute), lvol, rvol };
+    audioMixerSetMasterVolume(pThis->pMixer, &vol);
+#else
+    uint8_t lvol = pThis->mixer_regs[0x30];
+    uint8_t rvol = pThis->mixer_regs[0x31];
+
+    AUD_set_volume(AUD_MIXER_VOLUME, &mute, &lvol, &rvol);
+#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
+}
+
+static void sb16SetPcmOutVolume(PSB16STATE pThis)
+{
+    int     mute = 0; /** @todo Handle (un)muting. */
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    uint8_t lvol = sb16MixRegToVol(pThis, 0x32);
+    uint8_t rvol = sb16MixRegToVol(pThis, 0x33);
+    PDMAUDIOVOLUME vol = { RT_BOOL(mute), lvol, rvol };
+    audioMixerSetSinkVolume(pThis->pSinkOutput, &vol);
+#else
+    uint8_t lvol = pThis->mixer_regs[0x32];
+    uint8_t rvol = pThis->mixer_regs[0x33];
+
+    AUD_set_volume(AUD_MIXER_PCM, &mute, &lvol, &rvol);
+#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
+}
+
 static void sb16ResetLegacy(PSB16STATE pThis)
 {
@@ -1323 +1366 @@
 
     /* voice volume L d5,d7, R d1,d3 */
-    pThis->mixer_regs[0x04] = (4 << 5) | (4 << 1);
+    pThis->mixer_regs[0x04] = (12 << 4) | 12;
     /* master ... */
-    pThis->mixer_regs[0x22] = (4 << 5) | (4 << 1);
+    pThis->mixer_regs[0x22] = (12 << 4) | 12;
     /* MIDI ... */
-    pThis->mixer_regs[0x26] = (4 << 5) | (4 << 1);
-
-    for (int i = 0x30; i < 0x48; i++)
-        pThis->mixer_regs[i] = 0x20;
+    pThis->mixer_regs[0x26] = (12 << 4) | 12;
+
+    /* master/voice/MIDI L/R volume */
+    for (int i = 0x30; i < 0x36; i++)
+        pThis->mixer_regs[i] = 24 << 3; /* -14 dB */
+
+    /* treble/bass */
+    for (int i = 0x44; i < 0x48; i++)
+        pThis->mixer_regs[i] = 0x80;
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
@@ -1352 +1400 @@
     }
 #endif
+
+    /* Update the master (mixer) and PCM out volumes. */
+    sb16SetMasterVolume(pThis);
+    sb16SetPcmOutVolume(pThis);
 }
 
@@ -1475 +1527 @@
     /* Update the master (mixer) volume. */
     if (fUpdateMaster)
-    {
-        int     mute = 0; /** @todo Handle (un)muting. */
-        uint8_t lvol = pThis->mixer_regs[0x30];
-        uint8_t rvol = pThis->mixer_regs[0x31];
-
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-        PDMAUDIOVOLUME vol = { RT_BOOL(mute), lvol, rvol };
-        audioMixerSetMasterVolume(pThis->pMixer, &vol);
-#else
-        AUD_set_volume(AUD_MIXER_VOLUME, &mute, &lvol, &rvol);
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
-    }
+        sb16SetMasterVolume(pThis);
 
     /* Update the stream (PCM) volume. */
     if (fUpdateStream)
-    {
-        int     mute = 0; /** @todo Handle (un)muting. */
-        uint8_t lvol = pThis->mixer_regs[0x32];
-        uint8_t rvol = pThis->mixer_regs[0x33];
-
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-        PDMAUDIOVOLUME vol = { RT_BOOL(mute), lvol, rvol };
-        audioMixerSetSinkVolume(pThis->pSinkOutput, &vol);
-#else
-        AUD_set_volume(AUD_MIXER_PCM, &mute, &lvol, &rvol);
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
-    }
+        sb16SetPcmOutVolume(pThis);
 
     return VINF_SUCCESS;
@@ -2047 +2077 @@
         uLUN++;
     }
+    /* Ensure volume gets propagated. */
+    audioMixerInvalidate(pThis->pMixer);
 
     return rc;