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 crash in audio subsampling if timing lockstep breaks

This commit is contained in:
Vicki Pfau 2024-06-25 04:08:47 -07:00
parent a4c2571d98
commit 79193b914b
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -24,6 +24,7 @@ Other fixes:
- Debugger: Fix writing to specific segment in command-line debugger - Debugger: Fix writing to specific segment in command-line debugger
- GB: Fix uninitialized save data when loading undersized temporary saves - GB: Fix uninitialized save data when loading undersized temporary saves
- GBA Audio: Fix crash if audio FIFOs and timers get out of sync - GBA Audio: Fix crash if audio FIFOs and timers get out of sync
- GBA Audio: Fix crash in audio subsampling if timing lockstep breaks
- GBA Memory: Let raw access read high MMIO addresses - GBA Memory: Let raw access read high MMIO addresses
- Qt: Fix savestate preview sizes with different scales (fixes mgba.io/i/2560) - Qt: Fix savestate preview sizes with different scales (fixes mgba.io/i/2560)
- Qt: Fix potential crash when configuring shortcuts - Qt: Fix potential crash when configuring shortcuts

2
include/mgba/internal/gba/audio.h
View File

@ -80,7 +80,7 @@ struct GBAAudio {
int32_t sampleInterval; int32_t sampleInterval;
int32_t lastSample; int32_t lastSample;
int sampleIndex; unsigned sampleIndex;
struct mStereoSample currentSamples[GBA_MAX_SAMPLES]; struct mStereoSample currentSamples[GBA_MAX_SAMPLES];
bool forceDisableChA; bool forceDisableChA;

3
src/gba/audio.c
View File

@ -232,6 +232,9 @@ void GBAAudioWriteSOUNDBIAS(struct GBAAudio* audio, uint16_t value) {
if (oldSampleInterval != audio->sampleInterval) { if (oldSampleInterval != audio->sampleInterval) {
timestamp -= audio->lastSample; timestamp -= audio->lastSample;
audio->sampleIndex = timestamp >> (9 - GBARegisterSOUNDBIASGetResolution(value)); audio->sampleIndex = timestamp >> (9 - GBARegisterSOUNDBIASGetResolution(value));
if (audio->sampleIndex >= GBA_MAX_SAMPLES) {
audio->sampleIndex = 0;
}
if (audio->p->stream && audio->p->stream->audioRateChanged) { if (audio->p->stream && audio->p->stream->audioRateChanged) {
audio->p->stream->audioRateChanged(audio->p->stream, GBA_ARM7TDMI_FREQUENCY / audio->sampleInterval); audio->p->stream->audioRateChanged(audio->p->stream, GBA_ARM7TDMI_FREQUENCY / audio->sampleInterval);
} }