libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 00:20:01 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Reimplement EVENT_CMD_SET_FRAME_LIMIT and make frame_limit_minimum_time

Browse Source 
and frame_limit_last_time static local variables of rarch_main_iterate
This commit is contained in:
twinaphex 2015-12-04 09:54:12 +01:00
parent 251bca7166
commit cc1f0e6ab4
5 changed files with 43 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command_event.c
View File

@ -1597,7 +1597,7 @@ bool event_command(enum event_command cmd)
event_set_volume(-0.5f); event_set_volume(-0.5f);
break; break;
case EVENT_CMD_SET_FRAME_LIMIT: case EVENT_CMD_SET_FRAME_LIMIT:
runloop_ctl(RUNLOOP_CTL_SET_FRAME_LIMIT_LAST_TIME, NULL); runloop_ctl(RUNLOOP_CTL_SET_FRAME_LIMIT, NULL);
break; break;
case EVENT_CMD_NONE: case EVENT_CMD_NONE:
default: default:

4
command_event.h
View File

@ -35,6 +35,7 @@ enum event_command
#endif #endif
EVENT_CMD_LOAD_CONTENT_IMAGEVIEWER, EVENT_CMD_LOAD_CONTENT_IMAGEVIEWER,
EVENT_CMD_SET_PER_GAME_RESOLUTION, EVENT_CMD_SET_PER_GAME_RESOLUTION,
EVENT_CMD_SET_FRAME_LIMIT,
/* Loads core. */ /* Loads core. */
EVENT_CMD_LOAD_CORE_DEINIT, EVENT_CMD_LOAD_CORE_DEINIT,
EVENT_CMD_LOAD_CORE, EVENT_CMD_LOAD_CORE,
@ -201,8 +202,7 @@ enum event_command
EVENT_CMD_REMAPPING_INIT, EVENT_CMD_REMAPPING_INIT,
EVENT_CMD_REMAPPING_DEINIT, EVENT_CMD_REMAPPING_DEINIT,
EVENT_CMD_VOLUME_UP, EVENT_CMD_VOLUME_UP,
EVENT_CMD_VOLUME_DOWN, EVENT_CMD_VOLUME_DOWN
EVENT_CMD_SET_FRAME_LIMIT
}; };
typedef struct event_cmd_state typedef struct event_cmd_state

3
retroarch.c
View File

@ -1131,9 +1131,8 @@ void rarch_main_free(void)
void rarch_init_system_av_info(void) void rarch_init_system_av_info(void)
{ {
struct retro_system_av_info *av_info = video_viewport_get_system_av_info(); struct retro_system_av_info *av_info = video_viewport_get_system_av_info();
core.retro_get_system_av_info(av_info); core.retro_get_system_av_info(av_info);
event_command(EVENT_CMD_SET_FRAME_LIMIT); runloop_ctl(RUNLOOP_CTL_SET_FRAME_LIMIT, NULL);
} }
/** /**

58
runloop.c
View File

@ -66,8 +66,6 @@ static unsigned runloop_pending_windowed_scale;
static unsigned main_max_frames; static unsigned main_max_frames;
static retro_time_t frame_limit_last_time;
static retro_time_t frame_limit_minimum_time;
static msg_queue_t *g_msg_queue; static msg_queue_t *g_msg_queue;
@ -368,6 +366,7 @@ bool *runloop_perfcnt_enabled(void)
bool runloop_ctl(enum runloop_ctl_state state, void *data) bool runloop_ctl(enum runloop_ctl_state state, void *data)
{ {
static char runloop_fullpath[PATH_MAX_LENGTH]; static char runloop_fullpath[PATH_MAX_LENGTH];
static bool runloop_set_frame_limit = false;
static bool runloop_paused = false; static bool runloop_paused = false;
static bool runloop_idle = false; static bool runloop_idle = false;
static bool runloop_exec = false; static bool runloop_exec = false;
@ -380,6 +379,14 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
switch (state) switch (state)
{ {
case RUNLOOP_CTL_SET_FRAME_LIMIT:
runloop_set_frame_limit = true;
break;
case RUNLOOP_CTL_UNSET_FRAME_LIMIT:
runloop_set_frame_limit = false;
break;
case RUNLOOP_CTL_SHOULD_SET_FRAME_LIMIT:
return runloop_set_frame_limit;
case RUNLOOP_CTL_SET_PERFCNT_ENABLE: case RUNLOOP_CTL_SET_PERFCNT_ENABLE:
{ {
bool *perfcnt_enable = runloop_perfcnt_enabled(); bool *perfcnt_enable = runloop_perfcnt_enabled();
@ -653,7 +660,6 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
runloop_idle = false; runloop_idle = false;
runloop_paused = false; runloop_paused = false;
runloop_slowmotion = false; runloop_slowmotion = false;
frame_limit_last_time = 0.0;
main_max_frames = 0; main_max_frames = 0;
break; break;
case RUNLOOP_CTL_GLOBAL_FREE: case RUNLOOP_CTL_GLOBAL_FREE:
@ -684,18 +690,6 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
main_max_frames = *ptr; main_max_frames = *ptr;
} }
break; break;
case RUNLOOP_CTL_SET_FRAME_LIMIT_LAST_TIME:
{
struct retro_system_av_info *av_info = video_viewport_get_system_av_info();
float fastforward_ratio = settings->fastforward_ratio;
if (fastforward_ratio == 0.0f)
fastforward_ratio = 1.0f;
frame_limit_last_time = retro_get_time_usec();
frame_limit_minimum_time = (retro_time_t)roundf(1000000.0f / (av_info->timing.fps * fastforward_ratio));
}
break;
case RUNLOOP_CTL_IS_IDLE: case RUNLOOP_CTL_IS_IDLE:
return runloop_idle; return runloop_idle;
case RUNLOOP_CTL_SET_IDLE: case RUNLOOP_CTL_SET_IDLE:
@ -979,14 +973,29 @@ int rarch_main_iterate(unsigned *sleep_ms)
retro_input_t trigger_input; retro_input_t trigger_input;
event_cmd_state_t cmd; event_cmd_state_t cmd;
retro_time_t current, target, to_sleep_ms; retro_time_t current, target, to_sleep_ms;
static retro_input_t last_input = 0; static retro_time_t frame_limit_minimum_time = 0.0;
driver_t *driver = driver_get_ptr(); static retro_time_t frame_limit_last_time = 0.0;
settings_t *settings = config_get_ptr(); static retro_input_t last_input = 0;
global_t *global = global_get_ptr(); driver_t *driver = driver_get_ptr();
retro_input_t input = input_keys_pressed(); settings_t *settings = config_get_ptr();
rarch_system_info_t *system = rarch_system_info_get_ptr(); global_t *global = global_get_ptr();
retro_input_t old_input = last_input; retro_input_t input = input_keys_pressed();
last_input = input; rarch_system_info_t *system = rarch_system_info_get_ptr();
retro_input_t old_input = last_input;
last_input = input;
if (runloop_ctl(RUNLOOP_CTL_SHOULD_SET_FRAME_LIMIT, NULL))
{
struct retro_system_av_info *av_info = video_viewport_get_system_av_info();
float fastforward_ratio = (settings->fastforward_ratio == 0.0f)
? 1.0f : settings->fastforward_ratio;
frame_limit_last_time = retro_get_time_usec();
frame_limit_minimum_time = (retro_time_t)roundf(1000000.0f
/ (av_info->timing.fps * fastforward_ratio));
runloop_ctl(RUNLOOP_CTL_UNSET_FRAME_LIMIT, NULL);
}
if (input_driver_ctl(RARCH_INPUT_CTL_IS_FLUSHING_INPUT, NULL)) if (input_driver_ctl(RARCH_INPUT_CTL_IS_FLUSHING_INPUT, NULL))
{ {
@ -1071,7 +1080,10 @@ int rarch_main_iterate(unsigned *sleep_ms)
ret = rarch_main_iterate_time_to_exit(&cmd); ret = rarch_main_iterate_time_to_exit(&cmd);
if (ret != 1) if (ret != 1)
{
frame_limit_last_time = 0.0;
return -1; return -1;
}
#ifdef HAVE_MENU #ifdef HAVE_MENU

6
runloop.h
View File

@ -34,7 +34,10 @@ extern "C" {
enum runloop_ctl_state enum runloop_ctl_state
{ {
RUNLOOP_CTL_IS_IDLE = 0, RUNLOOP_CTL_SET_FRAME_LIMIT = 0,
RUNLOOP_CTL_UNSET_FRAME_LIMIT,
RUNLOOP_CTL_SHOULD_SET_FRAME_LIMIT,
RUNLOOP_CTL_IS_IDLE,
RUNLOOP_CTL_GET_WINDOWED_SCALE, RUNLOOP_CTL_GET_WINDOWED_SCALE,
RUNLOOP_CTL_SET_WINDOWED_SCALE, RUNLOOP_CTL_SET_WINDOWED_SCALE,
RUNLOOP_CTL_SET_IDLE, RUNLOOP_CTL_SET_IDLE,
@ -48,7 +51,6 @@ enum runloop_ctl_state
RUNLOOP_CTL_IS_PAUSED, RUNLOOP_CTL_IS_PAUSED,
RUNLOOP_CTL_SET_PAUSED, RUNLOOP_CTL_SET_PAUSED,
RUNLOOP_CTL_SET_MAX_FRAMES, RUNLOOP_CTL_SET_MAX_FRAMES,
RUNLOOP_CTL_SET_FRAME_LIMIT_LAST_TIME,
RUNLOOP_CTL_CLEAR_STATE, RUNLOOP_CTL_CLEAR_STATE,
RUNLOOP_CTL_STATE_FREE, RUNLOOP_CTL_STATE_FREE,
RUNLOOP_CTL_GLOBAL_FREE, RUNLOOP_CTL_GLOBAL_FREE,