ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GBA Audio: Fix sample order in audio channel 3

This commit is contained in:
Jeffrey Pfau 2015-06-29 01:08:14 -07:00
parent 841a0909b9
commit 8a0c5b9a1f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -50,6 +50,7 @@ Bugfixes:
- GBA Memory: Fix load/store multiple video memory waitstates - GBA Memory: Fix load/store multiple video memory waitstates
- GBA: Fix timing of reading from timer registers - GBA: Fix timing of reading from timer registers
- Util: Allow loading IPS patches that grow the ROM - Util: Allow loading IPS patches that grow the ROM
- GBA Audio: Fix sample order in audio channel 3
Misc: Misc:
- Qt: Handle saving input settings better - Qt: Handle saving input settings better
- Debugger: Free watchpoints in addition to breakpoints - Debugger: Free watchpoints in addition to breakpoints

10
src/gba/audio.c
View File

@ -704,15 +704,15 @@ static int32_t _updateChannel3(struct GBAAudioChannel3* ch) {
start = 3; start = 3;
end = 0; end = 0;
} }
uint32_t bitsCarry = ch->wavedata[end] & 0x0F000000; uint32_t bitsCarry = ch->wavedata[end] & 0x000000F0;
uint32_t bits; uint32_t bits;
for (i = start; i >= end; --i) { for (i = start; i >= end; --i) {
bits = ch->wavedata[i] & 0x0F000000; bits = ch->wavedata[i] & 0x000000F0;
ch->wavedata[i] = ((ch->wavedata[i] & 0xF0F0F0F0) >> 4) | ((ch->wavedata[i] & 0x000F0F0F) << 12); ch->wavedata[i] = ((ch->wavedata[i] & 0x0F0F0F0F) << 4) | ((ch->wavedata[i] & 0xF0F0F000) >> 12);
ch->wavedata[i] |= bitsCarry >> 20; ch->wavedata[i] |= bitsCarry << 20;
bitsCarry = bits; bitsCarry = bits;
} }
ch->sample = bitsCarry >> 24; ch->sample = bitsCarry >> 4;
ch->sample -= 8; ch->sample -= 8;
ch->sample *= volume * 4; ch->sample *= volume * 4;
return 8 * (2048 - ch->control.rate); return 8 * (2048 - ch->control.rate);