diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-09-03 12:37:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-03 12:37:44 -0700 |
| commit | 61b84257aecd53855472ffa0dcf0abba5d90d745 (patch) | |
| tree | fcf2501a0aa71f926e8d9e89ad5d9934aa535700 /src/audio_core/codec.cpp | |
| parent | 5a5cea4a8f24ed2fbfb86da5fb029dc256a73721 (diff) | |
| parent | 61bde9974bb8dd7776295467ba6182aeec67da27 (diff) | |
Merge pull request #2050 from MerryMage/adpcm
codec: Fix ADPCM distortion caused by incorrect nibble order
Diffstat (limited to 'src/audio_core/codec.cpp')
| -rw-r--r-- | src/audio_core/codec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/audio_core/codec.cpp b/src/audio_core/codec.cpp index ab65514b73..3e23323f1c 100644 --- a/src/audio_core/codec.cpp +++ b/src/audio_core/codec.cpp @@ -58,11 +58,11 @@ StereoBuffer16 DecodeADPCM(const u8* const data, const size_t sample_count, cons size_t outputi = framei * SAMPLES_PER_FRAME; size_t datai = framei * FRAME_LEN + 1; for (size_t i = 0; i < SAMPLES_PER_FRAME && outputi < sample_count; i += 2) { - const s16 sample1 = decode_sample(SIGNED_NIBBLES[data[datai] & 0xF]); + const s16 sample1 = decode_sample(SIGNED_NIBBLES[data[datai] >> 4]); ret[outputi].fill(sample1); outputi++; - const s16 sample2 = decode_sample(SIGNED_NIBBLES[data[datai] >> 4]); + const s16 sample2 = decode_sample(SIGNED_NIBBLES[data[datai] & 0xF]); ret[outputi].fill(sample2); outputi++; |