mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(runloop.c) Refactors

Browse Source
This commit is contained in:
twinaphex 2015-08-05 14:36:35 +02:00
parent a1e6313453
commit f39ab89867
3 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
retroarch.c
View File

@ -1155,10 +1155,9 @@ void rarch_init_system_av_info(void)
{ {
struct retro_system_av_info *av_info = struct retro_system_av_info *av_info =
video_viewport_get_system_av_info(); video_viewport_get_system_av_info();
global_t *global = global_get_ptr();
pretro_get_system_av_info(av_info); pretro_get_system_av_info(av_info);
global->frames.limit.last_time = rarch_get_time_usec(); rarch_main_set_frame_limit_last_time(rarch_get_time_usec());
} }
/** /**

38
runloop.c
View File

@ -48,6 +48,8 @@ static bool main_is_idle;
static bool main_is_paused; static bool main_is_paused;
static bool main_is_slowmotion; static bool main_is_slowmotion;
static retro_time_t frame_limit_last_time;
/** /**
* check_pause: * check_pause:
* @pressed : was libretro pause key pressed? * @pressed : was libretro pause key pressed?
@ -655,33 +657,27 @@ static void rarch_update_frame_time(driver_t *driver, settings_t *settings,
* *
* Limit frame time if fast forward ratio throttle is enabled. * Limit frame time if fast forward ratio throttle is enabled.
**/ **/
static void rarch_limit_frame_time(settings_t *settings, global_t *global) static void rarch_limit_frame_time(settings_t *settings)
{ {
retro_time_t target = 0; retro_time_t current = rarch_get_time_usec();
retro_time_t to_sleep_ms = 0; struct retro_system_av_info *av_info =
retro_time_t current = rarch_get_time_usec();
struct retro_system_av_info *av_info =
video_viewport_get_system_av_info(); video_viewport_get_system_av_info();
double effective_fps = av_info->timing.fps * settings->fastforward_ratio; double effective_fps = av_info->timing.fps * settings->fastforward_ratio;
double mft_f = 1000000.0f / effective_fps; double mft_f = 1000000.0f / effective_fps;
retro_time_t frame_limit_minimum_time = (retro_time_t) roundf(mft_f);
global->frames.limit.minimum_time = (retro_time_t) roundf(mft_f); retro_time_t target = frame_limit_last_time + frame_limit_minimum_time;
retro_time_t to_sleep_ms = (target - current) / 1000;
target = global->frames.limit.last_time +
global->frames.limit.minimum_time;
to_sleep_ms = (target - current) / 1000;
if (to_sleep_ms <= 0) if (to_sleep_ms <= 0)
{ {
global->frames.limit.last_time = rarch_get_time_usec(); frame_limit_last_time = rarch_get_time_usec();
return; return;
} }
rarch_sleep((unsigned int)to_sleep_ms); rarch_sleep((unsigned int)to_sleep_ms);
/* Combat jitter a bit. */ /* Combat jitter a bit. */
global->frames.limit.last_time += frame_limit_last_time += frame_limit_minimum_time;
global->frames.limit.minimum_time;
} }
/** /**
@ -851,11 +847,15 @@ void rarch_main_state_free(void)
main_is_idle = false; main_is_idle = false;
main_is_paused = false; main_is_paused = false;
main_is_slowmotion = false; main_is_slowmotion = false;
g_extern.frames.limit.minimum_time = 0.0; frame_limit_last_time = 0.0;
g_extern.frames.limit.last_time = 0.0;
g_extern.max_frames = 0; g_extern.max_frames = 0;
} }
void rarch_main_set_frame_limit_last_time(retro_time_t t)
{
frame_limit_last_time = t;
}
void rarch_main_global_free(void) void rarch_main_global_free(void)
{ {
event_command(EVENT_CMD_TEMPORARY_CONTENT_DEINIT); event_command(EVENT_CMD_TEMPORARY_CONTENT_DEINIT);
@ -1140,7 +1140,7 @@ int rarch_main_iterate(void)
success: success:
if (settings->fastforward_ratio_throttle_enable) if (settings->fastforward_ratio_throttle_enable)
rarch_limit_frame_time(settings, global); rarch_limit_frame_time(settings);
return ret; return ret;
} }

12
runloop.h
View File

@ -27,6 +27,7 @@
#include "cheats.h" #include "cheats.h"
#include "dynamic.h" #include "dynamic.h"
#include "system.h" #include "system.h"
#include "performance.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -42,15 +43,6 @@ typedef struct rarch_resolution
typedef struct global typedef struct global
{ {
struct
{
struct
{
retro_time_t minimum_time;
retro_time_t last_time;
} limit;
} frames;
unsigned max_frames; unsigned max_frames;
bool verbosity; bool verbosity;
@ -347,6 +339,8 @@ void rarch_main_set_slowmotion(unsigned enable);
void rarch_main_set_pause(unsigned enable); void rarch_main_set_pause(unsigned enable);
void rarch_main_set_frame_limit_last_time(retro_time_t t);
void rarch_main_set_idle(unsigned enable); void rarch_main_set_idle(unsigned enable);
void rarch_main_state_free(void); void rarch_main_state_free(void);