libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-29 11:20:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a possible crash in audio code

Browse Source
This commit is contained in:
Henrik Rydgard 2012-12-17 21:59:43 +01:00
parent a60d487d8d
commit c3819ec721
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Core/HW/SasAudio.cpp
View File

@ -207,7 +207,7 @@ void SasInstance::Mix(u32 outAddr) {
// TODO: Special case no-resample case for speed
if (voice.vagAddr != 0) {
if (voice.type == VOICETYPE_VAG && voice.vagAddr != 0) {
// Load resample history (so we can use a wide filter)
resampleBuffer[0] = voice.resampleHist[0];
resampleBuffer[1] = voice.resampleHist[1];
@ -263,10 +263,10 @@ void SasInstance::Mix(u32 outAddr) {
voice.playing = false;
}
}
else if (voice.pcmAddr != 0) {
else if (voice.type == VOICETYPE_PCM && voice.pcmAddr != 0) {
// PCM mixing should be easy, can share code with VAG
}
else if (voice.noiseFreq != 0) {
else if (voice.type == VOICETYPE_NOISE && voice.noiseFreq != 0) {
// Generate noise?
}
}
@ -301,17 +301,22 @@ void SasVoice::Reset() {
}
void SasVoice::KeyOn() {
on = true;
playing = true;
paused = false;
envelope.KeyOn();
switch (type) {
case VOICETYPE_VAG:
vag.Start(Memory::GetPointer(vagAddr), loop);
if (Memory::IsValidAddress(vagAddr)) {
vag.Start(Memory::GetPointer(vagAddr), loop);
} else {
ERROR_LOG(SAS, "Invalid VAG address %08x", vagAddr);
return;
}
break;
default:
break;
}
playing = true;
on = true;
paused = false;
}
void SasVoice::KeyOff() {

2
GPU/GLES/DisplayListInterpreter.cpp
View File

@ -106,7 +106,7 @@ void GLES_GPU::SetDisplayFramebuffer(u32 framebuf, u32 stride, int format)
displayStride_ = stride;
displayFormat_ = format;
} else {
DEBUG_LOG(HLE, "Bogus framebuffer address: %08x", framebuf);
ERROR_LOG(HLE, "Bogus framebuffer address: %08x", framebuf);
}
}