piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 01:59:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix framelimiter's accuracy, thanks to sskkiipp !(issue 1237)

Browse Source 
Also added an "auto" mode which automatically limits the framerate to fullspeed and move it from Interface settings to Basic setttings

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3934 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
sl1nk3.s
2009-08-03 18:35:25 +00:00
parent 8c36e85b34
commit 8b0bc273c5
3 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Source/Core/Core/Src/Core.cpp
View File

@ -602,38 +602,33 @@ void Callback_VideoCopiedToXFB(bool video_update)
static Common::Timer Timer;
static u32 frames = 0;
static u32 videoupd = 0;
static u64 old_frametime=0;
if (video_update)
videoupd++;
else
{
frames++;
// Custom frame limiter
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
// Custom frame limiter
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
u32 targetfps = SConfig::GetInstance().m_Framelimit * 5;
u32 targetfps = (SConfig::GetInstance().m_Framelimit)*5;
u64 new_frametime;
s16 wait_frametime;
if (targetfps > 5)
{
double wait_frametime = (1000.0 / targetfps);
if (targetfps > 0)
{
new_frametime = Timer.GetTimeDifference() - old_frametime;
old_frametime = Timer.GetTimeDifference();
wait_frametime = (1000/targetfps) - (u16)new_frametime;
if (targetfps < 35)
wait_frametime--;
if (wait_frametime > 0)
Common::SleepCurrentThread(wait_frametime*2);
}
while (Timer.GetTimeDifference() < wait_frametime * frames)
Common::SleepCurrentThread(1);
}
else if (targetfps < 5)
{
double wait_frametime = (1000.0 / VideoInterface::TargetRefreshRate);
while (Timer.GetTimeDifference() < wait_frametime * videoupd)
Common::SleepCurrentThread(1);
}
if (Timer.GetTimeDifference() >= 1000)
{
// reset timer for framelimiter, placed here so no additional check for 1000ms is required -> don't delete please :)
old_frametime = 0;
// Time passed
float t = (float)(Timer.GetTimeDifference()) / 1000.f;
@ -656,7 +651,8 @@ void Callback_VideoCopiedToXFB(bool video_update)
float FPS = (float)frames / t;
// for some reasons "VideoInterface::ActualRefreshRate" gives some odd results :(
float VPS = (float)videoupd / t;
int TargetVPS = (int)VideoInterface::TargetRefreshRate;
int TargetVPS = (int)(VideoInterface::TargetRefreshRate + 0.5);
float Speed = (VPS / TargetVPS) * 100.0f;