Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Set predict_nr = 0 when predict_nr greater than VAG array length

Browse source
This commit is contained in:
raven02 2013-01-31 22:16:15 +08:00
parent f1103b05c8
commit a4c78888c0
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Core/HW/SasAudio.cpp
View file

@ -39,14 +39,17 @@ void VagDecoder::Start(u32 data, int vagSize, bool loopEnabled) {
read_ = data;
curSample = 28;
curBlock_ = -1;
s_1 = 0.0; // per block?
s_2 = 0.0;
s_1 = 0; // per block?
s_2 = 0;
}
void VagDecoder::DecodeBlock(u8 *&readp) {
int predict_nr = *readp++;
int shift_factor = predict_nr & 0xf;
predict_nr >>= 4;
if (predict_nr >= sizeof(f) / sizeof(s8)) {
predict_nr = 0;
}
int flags = *readp++;
if (flags == 7) {
end_ = true;
@ -55,8 +58,10 @@ void VagDecoder::DecodeBlock(u8 *&readp) {
else if (flags == 6) {
loopStartBlock_ = curBlock_;
}
else if (flags == 3 && loopEnabled_) {
loopAtNextBlock_ = true;
else if (flags == 3) {
if (loopEnabled_) {
loopAtNextBlock_ = true;
}
}
for (int i = 0; i < 28; i += 2) {
int d = *readp++;
@ -66,7 +71,7 @@ void VagDecoder::DecodeBlock(u8 *&readp) {
samples[i + 1] = s >> shift_factor;
}
for (int i = 0; i < 28; i++) {
samples[i] = samples[i] + ((s_1 * f[predict_nr][0] + s_2 * f[predict_nr][1]) >> 6);
samples[i] = (int) (samples[i] + ((s_1 * f[predict_nr][0] + s_2 * f[predict_nr][1]) >> 6));
s_2 = s_1;
s_1 = samples[i];
}