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

Switch: Fix audio when video rate desyncs (fixes #1532)

This commit is contained in:
Vicki Pfau 2019-09-30 18:18:56 -07:00
parent 6bbf5755c6
commit c8cc2eba2e
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/platform/switch/main.c
View File

@ -20,7 +20,7 @@
#include <GLES3/gl31.h> #include <GLES3/gl31.h>
#define AUTO_INPUT 0x4E585031 #define AUTO_INPUT 0x4E585031
#define SAMPLES 0x400 #define SAMPLES 0x200
#define BUFFER_SIZE 0x1000 #define BUFFER_SIZE 0x1000
#define N_BUFFERS 4 #define N_BUFFERS 4
#define ANALOG_DEADZONE 0x4000 #define ANALOG_DEADZONE 0x4000
@ -281,6 +281,8 @@ static void _setup(struct mGUIRunner* runner) {
if (mCoreConfigGetUIntValue(&runner->config, "screenMode", &mode) && mode < SM_MAX) { if (mCoreConfigGetUIntValue(&runner->config, "screenMode", &mode) && mode < SM_MAX) {
screenMode = mode; screenMode = mode;
} }
runner->core->setAudioBufferSize(runner->core, SAMPLES);
} }
static void _gameLoaded(struct mGUIRunner* runner) { static void _gameLoaded(struct mGUIRunner* runner) {
@ -539,6 +541,11 @@ static void _postAudioBuffer(struct mAVStream* stream, blip_t* left, blip_t* rig
if (enqueuedBuffers >= N_BUFFERS - 1 && R_SUCCEEDED(audoutWaitPlayFinish(&releasedBuffers, &audoutNReleasedBuffers, 10000000))) { if (enqueuedBuffers >= N_BUFFERS - 1 && R_SUCCEEDED(audoutWaitPlayFinish(&releasedBuffers, &audoutNReleasedBuffers, 10000000))) {
enqueuedBuffers -= audoutNReleasedBuffers; enqueuedBuffers -= audoutNReleasedBuffers;
} }
if (enqueuedBuffers >= N_BUFFERS) {
blip_clear(left);
blip_clear(right);
return;
}
struct GBAStereoSample* samples = audioBuffer[audioBufferActive]; struct GBAStereoSample* samples = audioBuffer[audioBufferActive];
blip_read_samples(left, &samples[0].left, SAMPLES, true); blip_read_samples(left, &samples[0].left, SAMPLES, true);
@ -754,7 +761,7 @@ int main(int argc, char* argv[]) {
audoutBuffer[i].next = NULL; audoutBuffer[i].next = NULL;
audoutBuffer[i].buffer = audioBuffer[i]; audoutBuffer[i].buffer = audioBuffer[i];
audoutBuffer[i].buffer_size = BUFFER_SIZE; audoutBuffer[i].buffer_size = BUFFER_SIZE;
audoutBuffer[i].data_size = BUFFER_SIZE; audoutBuffer[i].data_size = SAMPLES * 4;
audoutBuffer[i].data_offset = 0; audoutBuffer[i].data_offset = 0;
} }