Skip to content

Allow to choose between old and new speed limiter from ricrpi #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Gillou68310 wants to merge 2 commits into from
Closed

Allow to choose between old and new speed limiter from ricrpi #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7eb813
Allow to choose between old and new speed limiter from ricrpi
Apr 28, 2015
557b71a
Removed useless main_set_speedlimiter function
Apr 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion doc/emuwiki-api-doc/Mupen64Plus-v2.0-Core-Front-End.mediawiki
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,9 @@ These core parameters may be read and/or written using the M64CMD_CORE_STATE_QUE
|M64CORE_SPEED_LIMITER
|Yes
|Yes
|<tt>1</tt> to enable speed limiter, or <tt>0</tt> to disable speed limiter.
|<tt>0</tt>=disable speed limiter, <tt>1</tt>=old speed limiter, <tt>2</tt>=new speed limiter
|When speed limiter is disabled, emulator will run as fast as possible (useful for benchmarking).
|New speed limiter improve performance on Raspberry Pi.
|-
|M64CORE_VIDEO_SIZE
|Yes
Expand Down
87 changes: 71 additions & 16 deletions src/main/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ static int l_CurrentFrame = 0; // frame counter
static int l_TakeScreenshot = 0; // Tell OSD Rendering callback to take a screenshot just before drawing the OSD
static int l_SpeedFactor = 100; // percentage of nominal game speed at which emulator is running
static int l_FrameAdvance = 0; // variable to check if we pause on next frame
static int l_MainSpeedLimit = 1; // insert delay during vi_interrupt to keep speed at real-time
static int l_MainSpeedLimit = 2; // insert delay during vi_interrupt to keep speed at real-time

static osd_message_t *l_msgVol = NULL;
static osd_message_t *l_msgFF = NULL;
Expand Down Expand Up @@ -342,11 +342,6 @@ void main_set_fastforward(int enable)

}

static void main_set_speedlimiter(int enable)
{
l_MainSpeedLimit = enable ? 1 : 0;
}

static int main_is_paused(void)
{
return (g_EmulatorRunning && rompause);
Expand Down Expand Up @@ -574,7 +569,7 @@ m64p_error main_core_state_set(m64p_core_param param, int val)
main_speedset(val);
return M64ERR_SUCCESS;
case M64CORE_SPEED_LIMITER:
main_set_speedlimiter(val);
l_MainSpeedLimit = val;
return M64ERR_SUCCESS;
case M64CORE_VIDEO_SIZE:
{
Expand Down Expand Up @@ -732,7 +727,52 @@ void new_frame(void)
}
}

static void apply_speed_limiter(void)
static void apply_old_speed_limiter(void)
{
int Dif;
unsigned int CurrentFPSTime;
static unsigned int LastFPSTime = 0;
static unsigned int CounterTime = 0;
static unsigned int CalculatedTime ;
static int VI_Counter = 0;

double VILimitMilliseconds = 1000.0 / ROM_PARAMS.vilimit;
double AdjustedLimit = VILimitMilliseconds * 100.0 / l_SpeedFactor; // adjust for selected emulator speed
int time;

VI_Counter++;

if(LastFPSTime == 0)
{
LastFPSTime = CounterTime = SDL_GetTicks();
return;
}
CurrentFPSTime = SDL_GetTicks();

Dif = CurrentFPSTime - LastFPSTime;

if (Dif < AdjustedLimit)
{
CalculatedTime = (unsigned int) (CounterTime + AdjustedLimit * VI_Counter);
time = (int)(CalculatedTime - CurrentFPSTime);
if (time > 0)
{
DebugMessage(M64MSG_VERBOSE, " apply_old_speed_limiter(): Waiting %ims", time);
SDL_Delay(time);
}
CurrentFPSTime = CurrentFPSTime + time;
}

if (CurrentFPSTime - CounterTime >= 1000.0 )
{
CounterTime = SDL_GetTicks();
VI_Counter = 0;
}

LastFPSTime = CurrentFPSTime;
}

static void apply_new_speed_limiter(void)
{
unsigned int CurrentFPSTime;
static unsigned int LastFPSTime = 0;
Expand All @@ -744,12 +784,6 @@ static void apply_speed_limiter(void)
double AdjustedLimit = VILimitMilliseconds * 100.0 / l_SpeedFactor; // adjust for selected emulator speed
int ThisFrameDelta, IntegratedDelta, TimeToWait;

timed_section_start(TIMED_SECTION_IDLE);

#ifdef DBG
if(g_DebuggerActive) DebuggerCallback(DEBUG_UI_VI, 0);
#endif

// if this is the first frame, initialize our data structures
if(LastFPSTime == 0)
{
Expand All @@ -770,10 +804,10 @@ static void apply_speed_limiter(void)
// calculate the total time error over the last 64 frames
IntegratedDelta = VITotalDelta + ThisFrameDelta;
// if we are still too fast, and then speed limiter is on, then we should wait
if (IntegratedDelta < 0 && l_MainSpeedLimit)
if (IntegratedDelta < 0)
{
TimeToWait = (IntegratedDelta > ThisFrameDelta) ? -IntegratedDelta : -ThisFrameDelta;
DebugMessage(M64MSG_VERBOSE, " apply_speed_limiter(): Waiting %ims", TimeToWait);
DebugMessage(M64MSG_VERBOSE, " apply_new_speed_limiter(): Waiting %ims", TimeToWait);
SDL_Delay(TimeToWait);
// recalculate # of milliseconds that have passed since the last video interrupt,
// taking into account the time we just waited
Expand All @@ -787,7 +821,28 @@ static void apply_speed_limiter(void)
VITotalDelta += ThisFrameDelta - VIDeltas[VIDeltasIndex];
VIDeltas[VIDeltasIndex] = ThisFrameDelta;
VIDeltasIndex = (VIDeltasIndex + 1) & 63;
}

static void apply_speed_limiter(void)
{
timed_section_start(TIMED_SECTION_IDLE);

#ifdef DBG
if(g_DebuggerActive) DebuggerCallback(DEBUG_UI_VI, 0);
#endif

switch (l_MainSpeedLimit)
{
case 1:
apply_old_speed_limiter();
break;
case 2:
apply_new_speed_limiter();
break;
default:
break;
}

timed_section_end(TIMED_SECTION_IDLE);
}

Expand Down