claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VIA AC'97: Restore the 0x47 back (turns out it was *NOT* a mix-up), but divide by 208925 instead of by 32767, in order to keep the maximum in the -32768 to 32767 range even at +12 dB gain.

Browse Source
This commit is contained in:
OBattler
2025-04-01 06:42:14 +02:00
parent bc0d1884e8
commit 4c0f0ddd24
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sound/snd_ac97_codec.c
View File

@@ -537,7 +537,7 @@ ac97_codec_getattn(void *priv, uint8_t reg, int *l, int *r)
uint8_t r_val = val; uint8_t r_val = val;
if (reg <= 0x06) { /* 6-bit level */ if (reg <= 0x06) { /* 6-bit level */
*l = codec_attn[0x3f - (l_val & 0x3f)]; *l = codec_attn[0x3f - (l_val & 0x3f)];
*r = codec_attn[0x3f - (r_val & 0x3f)]; *r = codec_attn[0x47 - (r_val & 0x3f)];
} else { /* 5-bit gain */ } else { /* 5-bit gain */
/* Yes, 0x3f is correct, the 0x47 was most likely a decimal-hex mix-up. */ /* Yes, 0x3f is correct, the 0x47 was most likely a decimal-hex mix-up. */
*l = codec_attn[0x3f - (l_val & 0x1f)]; *l = codec_attn[0x3f - (l_val & 0x1f)];

5
src/sound/snd_ac97_via.c
View File

@@ -536,8 +536,13 @@ ac97_via_remap_modem_codec(void *priv, uint16_t new_io_base, uint8_t enable)
static void static void
ac97_via_update_stereo(ac97_via_t *dev, ac97_via_sgd_t *sgd) ac97_via_update_stereo(ac97_via_t *dev, ac97_via_sgd_t *sgd)
{ {
#ifdef OLD_CODE
int32_t l = (((sgd->out_l * sgd->vol_l) >> 15) * dev->master_vol_l) >> 15; int32_t l = (((sgd->out_l * sgd->vol_l) >> 15) * dev->master_vol_l) >> 15;
int32_t r = (((sgd->out_r * sgd->vol_r) >> 15) * dev->master_vol_r) >> 15; int32_t r = (((sgd->out_r * sgd->vol_r) >> 15) * dev->master_vol_r) >> 15;
#else
int32_t l = (((sgd->out_l * sgd->vol_l) / 208925) * dev->master_vol_l) >> 15;
int32_t r = (((sgd->out_r * sgd->vol_r) / 208925) * dev->master_vol_r) >> 15;
#endif
if (l < -32768) if (l < -32768)
l = -32768; l = -32768;