piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-23 06:10:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

start botching the FPS limiter

Browse Source 
results in shitty audio because it's overflowing the buffer
This commit is contained in:
Arisotura
2019-07-12 22:04:55 +02:00
parent 504ccb7044
commit ff27036b35
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/SPU.cpp
View File

@ -734,6 +734,7 @@ void Mix(u32 samples)
OutputBuffer[OutputWriteOffset + 1] = r >> 1;
OutputWriteOffset += 2;
OutputWriteOffset &= ((2*OutputBufferSize)-1);
if (OutputWriteOffset == OutputReadOffset) printf("!! SOUND FIFO OVERFLOW\n");
}
NDS::ScheduleEvent(NDS::Event_SPU, true, 1024*kSamplesPerRun, Mix, kSamplesPerRun);

22
src/libui_sdl/main.cpp
View File

@ -569,7 +569,7 @@ void AudioCallback(void* data, Uint8* stream, int len)
int num_in = SPU::ReadOutput(buf_in, 710);
int num_out = 1024;
printf("took %d/%d samples\n", num_in, 710);
int margin = 6;
if (num_in < 710-margin)
{
@ -962,7 +962,7 @@ int EmuThreadFunc(void* burp)
// framerate limiter based off SDL2_gfx
float framerate = (1000.0f * nlines) / (60.0f * 263.0f);
fpslimitcount++;
/*fpslimitcount++;
u32 curtick = SDL_GetTicks();
u32 delay = curtick - lasttick;
lasttick = curtick;
@ -978,6 +978,24 @@ int EmuThreadFunc(void* burp)
{
fpslimitcount = 0;
starttick = curtick;
}*/
fpslimitcount++;
if (fpslimitcount >= 3)
{
u32 curtick = SDL_GetTicks();
u32 delay = curtick - lasttick;
bool limitfps = Config::LimitFPS && !HotkeyDown(HK_FastForward);
u32 wantedtick = lasttick + (u32)((float)fpslimitcount * framerate);
if (curtick < wantedtick && limitfps)
{
SDL_Delay(wantedtick - curtick);
}
lasttick = SDL_GetTicks();
fpslimitcount = 0;
}
nframes++;