Revert "GB Audio: Make audio unsigned with bias (fixes #749)" This reverts commit fd60a1caff2c80ede9c2acda6986dea09abea5f0.
Vicki Pfau vi@endrift.com
Sat, 07 Apr 2018 20:58:09 -0700
1 files changed,
6 insertions(+),
6 deletions(-)
jump to
M
src/gb/audio.c
→
src/gb/audio.c
@@ -620,9 +620,8 @@ sampleRight += audio->ch4.sample;
} } - int dcOffset = audio->style == GB_AUDIO_GBA ? 0 : 0x1FC; - *left = (sampleLeft - dcOffset) * (1 + audio->volumeLeft); - *right = (sampleRight - dcOffset) * (1 + audio->volumeRight); + *left = sampleLeft * (1 + audio->volumeLeft); + *right = sampleRight * (1 + audio->volumeRight); } static void _sample(struct mTiming* timing, void* user, uint32_t cyclesLate) {@@ -710,7 +709,7 @@ return (envelope->initialVolume || envelope->direction) && envelope->dead != 2;
} static void _updateSquareSample(struct GBAudioSquareChannel* ch) { - ch->sample = ch->control.hi * ch->envelope.currentVolume * 0x8; + ch->sample = (ch->control.hi * 2 - 1) * ch->envelope.currentVolume * 0x8; } static int32_t _updateSquareChannel(struct GBAudioSquareChannel* ch) {@@ -861,7 +860,8 @@ }
ch->sample = bitsCarry >> 4; break; } - ch->sample *= volume * 2; + ch->sample -= 8; + ch->sample *= volume * 4; audio->ch3.readable = true; if (audio->style == GB_AUDIO_DMG) { mTimingDeschedule(audio->timing, &audio->ch3Fade);@@ -888,7 +888,7 @@ int32_t cycles = 0;
do { int lsb = ch->lfsr & 1; - ch->sample = lsb * 0x8; + ch->sample = lsb * 0x10 - 0x8; ch->sample *= ch->envelope.currentVolume; ch->lfsr >>= 1; ch->lfsr ^= (lsb * 0x60) << (ch->power ? 0 : 8);