Adds auto-frameskip to pcsx_rearmed

6 files changed, 415 insertions, 12 deletions

diff --git a/config.c b/config.c
index e124c81..c33d5cc 100644
--- a/config.c
+++ b/config.c
@@ -75,24 +75,26 @@ static void parse_num_val(uint32_t *cval, const char *src)
 	*cval = val;
 }
 
-static char *config_find_value(const char* cfg, const char *key) {
-	char *tmp;
+static const char *config_find_value(const char* cfg, const char *key) {
+	const char *tmp = cfg;
+
+	while ((tmp = strstr(tmp, key))) {
+		tmp += strlen(key);
+		if (strncmp(tmp, " = ", 3) == 0)
+			break;
+	};
 
-	tmp = strstr(cfg, key);
 	if (tmp == NULL)
 		return NULL;
-	tmp += strlen(key);
-	if (strncmp(tmp, " = ", 3) != 0)
-		return NULL;
-	tmp += 3;
 
+	tmp += 3;
 	return tmp;
 }
 
 void config_read(const char* cfg)
 {
 	for (size_t i = 0; i < array_size(config_data); i++) {
-		char *tmp = config_find_value(cfg, config_data[i].name);
+		const char *tmp = config_find_value(cfg, config_data[i].name);
 		if (!tmp)
 			continue;
 
@@ -110,7 +112,7 @@ void config_read(const char* cfg)
 		if (entry->blocked)
 			continue;
 
-		char *tmp = config_find_value(cfg, entry->key);
+		const char *tmp = config_find_value(cfg, entry->key);
 		if (!tmp)
 			continue;
 
diff --git a/main.c b/main.c
index 9a5effa..73c7617 100644
--- a/main.c
+++ b/main.c
@@ -541,7 +541,9 @@ int main(int argc, char **argv) {
 }
 
 int quit(int code) {
-	sram_write();
+	if (current_core.initialized)
+		sram_write();
+
 	menu_finish();
 	core_unload();
 	plat_finish();
diff --git a/menu.c b/menu.c
index 27d89fb..0b6eb1a 100644
--- a/menu.c
+++ b/menu.c
@@ -102,6 +102,25 @@ me_bind_action mame_ctrl_actions[] =
 	{ NULL,       0 }
 };
 
+me_bind_action pcsx_ctrl_actions[] =
+{
+	{ "UP       ",  1 << RETRO_DEVICE_ID_JOYPAD_UP},
+	{ "DOWN     ",  1 << RETRO_DEVICE_ID_JOYPAD_DOWN },
+	{ "LEFT     ",  1 << RETRO_DEVICE_ID_JOYPAD_LEFT },
+	{ "RIGHT    ",  1 << RETRO_DEVICE_ID_JOYPAD_RIGHT },
+	{ "CIRCLE   ",  1 << RETRO_DEVICE_ID_JOYPAD_A },
+	{ "CROSS    ",  1 << RETRO_DEVICE_ID_JOYPAD_B },
+	{ "TRIANGLE ",  1 << RETRO_DEVICE_ID_JOYPAD_X },
+	{ "SQUARE   ",  1 << RETRO_DEVICE_ID_JOYPAD_Y },
+	{ "START    ",  1 << RETRO_DEVICE_ID_JOYPAD_START },
+	{ "SELECT   ",  1 << RETRO_DEVICE_ID_JOYPAD_SELECT },
+	{ "L1 BUTTON",  1 << RETRO_DEVICE_ID_JOYPAD_L },
+	{ "R1 BUTTON",  1 << RETRO_DEVICE_ID_JOYPAD_R },
+	{ "L2 BUTTON",  1 << RETRO_DEVICE_ID_JOYPAD_L2 },
+	{ "R2 BUTTON",  1 << RETRO_DEVICE_ID_JOYPAD_R2 },
+	{ NULL,       0 }
+};
+
 me_bind_action snes_ctrl_actions[] =
 {
 	{ "UP       ",  1 << RETRO_DEVICE_ID_JOYPAD_UP},
@@ -354,6 +373,9 @@ static int key_config_loop_wrap(int id, int keys)
 	} else if (strstr(core_name, "mame")) {
 		actions = mame_ctrl_actions;
 		action_size = array_size(mame_ctrl_actions);
+	} else if (!strcmp(core_name, "pcsx_rearmed")) {
+		actions = pcsx_ctrl_actions;
+		action_size = array_size(pcsx_ctrl_actions);
 	} else if (strstr(core_name, "snes")) {
 		actions = snes_ctrl_actions;
 		action_size = array_size(snes_ctrl_actions);
diff --git a/patches/pcsx_rearmed/0001-audio-frameskip.patch b/patches/pcsx_rearmed/0001-audio-frameskip.patch
new file mode 100644
index 0000000..fb2f08c
--- /dev/null
+++ b/patches/pcsx_rearmed/0001-audio-frameskip.patch
@@ -0,0 +1,348 @@
+diff --git a/frontend/libretro.c b/frontend/libretro.c
+index 59e986e..f3e3c2b 100644
+--- a/frontend/libretro.c
++++ b/frontend/libretro.c
+@@ -96,6 +96,18 @@ static int show_advanced_gpu_unai_settings = -1;
+ static int show_other_input_settings = -1;
+ static float mouse_sensitivity = 1.0f;
+ 
++unsigned frameskip_type                  = 0;
++unsigned frameskip_threshold             = 0;
++unsigned frameskip_counter               = 0;
++unsigned frameskip_interval              = 0;
++
++int retro_audio_buff_active              = false;
++unsigned retro_audio_buff_occupancy      = 0;
++int retro_audio_buff_underrun            = false;
++
++unsigned retro_audio_latency             = 0;
++int update_audio_latency                 = false;
++
+ static unsigned previous_width = 0;
+ static unsigned previous_height = 0;
+ 
+@@ -1195,6 +1207,52 @@ static void set_retro_memmap(void)
+ #endif
+ }
+ 
++static void retro_audio_buff_status_cb(
++   bool active, unsigned occupancy, bool underrun_likely)
++{
++   retro_audio_buff_active    = active;
++   retro_audio_buff_occupancy = occupancy;
++   retro_audio_buff_underrun  = underrun_likely;
++}
++
++static void retro_set_audio_buff_status_cb(void)
++{
++   if (frameskip_type > 0)
++   {
++      struct retro_audio_buffer_status_callback buf_status_cb;
++
++      buf_status_cb.callback = retro_audio_buff_status_cb;
++      if (!environ_cb(RETRO_ENVIRONMENT_SET_AUDIO_BUFFER_STATUS_CALLBACK,
++            &buf_status_cb))
++      {
++         retro_audio_buff_active    = false;
++         retro_audio_buff_occupancy = 0;
++         retro_audio_buff_underrun  = false;
++         retro_audio_latency        = 0;
++      }
++      else
++      {
++         /* Frameskip is enabled - increase frontend
++          * audio latency to minimise potential
++          * buffer underruns */
++         uint32_t frame_time_usec = 1000000.0 / (is_pal_mode ? 50.0 : 60.0);
++
++         /* Set latency to 6x current frame time... */
++         retro_audio_latency = (unsigned)(6 * frame_time_usec / 1000);
++
++         /* ...then round up to nearest multiple of 32 */
++         retro_audio_latency = (retro_audio_latency + 0x1F) & ~0x1F;
++      }
++   }
++   else
++   {
++      environ_cb(RETRO_ENVIRONMENT_SET_AUDIO_BUFFER_STATUS_CALLBACK, NULL);
++      retro_audio_latency = 0;
++   }
++
++   update_audio_latency = true;
++}
++
+ static void update_variables(bool in_flight);
+ bool retro_load_game(const struct retro_game_info *info)
+ {
+@@ -1408,6 +1466,7 @@ bool retro_load_game(const struct retro_game_info *info)
+    emu_on_new_cd(0);
+ 
+    set_retro_memmap();
++   retro_set_audio_buff_status_cb();
+ 
+    return true;
+ }
+@@ -1478,11 +1537,43 @@ static void update_variables(bool in_flight)
+ #ifdef GPU_PEOPS
+    int gpu_peops_fix = 0;
+ #endif
++   unsigned prev_frameskip_type;
++
++   var.key = "pcsx_rearmed_frameskip_type";
++   var.value = NULL;
++
++   prev_frameskip_type = frameskip_type;
++   frameskip_type = 0;
++   pl_rearmed_cbs.frameskip = 0;
+ 
++   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
++   {
++      if (strcmp(var.value, "auto") == 0)
++         frameskip_type = 1;
++      if (strcmp(var.value, "auto_threshold") == 0)
++         frameskip_type = 2;
++      if (strcmp(var.value, "fixed_interval") == 0)
++         frameskip_type = 3;
++   }
++
++   if (frameskip_type != 0)
++      pl_rearmed_cbs.frameskip = -1;
++
++   var.key = "pcsx_rearmed_frameskip_threshold";
+    var.value = NULL;
++
++   frameskip_threshold = 30;
++
++   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
++      frameskip_threshold = strtol(var.value, NULL, 10);
++
+    var.key = "pcsx_rearmed_frameskip";
++   var.value = NULL;
++
++   frameskip_interval = 1;
++
+    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+-      pl_rearmed_cbs.frameskip = atoi(var.value);
++      frameskip_interval = strtol(var.value, NULL, 10);
+ 
+    var.value = NULL;
+    var.key = "pcsx_rearmed_region";
+@@ -2149,6 +2240,10 @@ static void update_variables(bool in_flight)
+          GPU_open(&gpuDisp, "PCSX", NULL);
+       }
+ 
++      /* Reinitialise frameskipping, if required */
++      if (((frameskip_type     != prev_frameskip_type)))
++         retro_set_audio_buff_status_cb();
++
+       /* dfinput_activate(); */
+    }
+    else
+@@ -2521,6 +2616,46 @@ void retro_run(void)
+ 
+    print_internal_fps();
+ 
++   /* Check whether current frame should
++    * be skipped */
++   pl_rearmed_cbs.fskip_force = 0;
++   pl_rearmed_cbs.fskip_dirty = 0;
++   if ((frameskip_type > 0) && retro_audio_buff_active)
++   {
++      bool skip_frame;
++
++      switch (frameskip_type)
++      {
++         case 1: /* auto */
++            skip_frame = retro_audio_buff_underrun;
++            break;
++         case 2: /* threshold */
++            skip_frame = (retro_audio_buff_occupancy < frameskip_threshold);
++            break;
++         case 3: /* fixed */
++            skip_frame = true;
++            break;
++         default:
++            skip_frame = false;
++            break;
++      }
++
++      if (skip_frame && frameskip_counter < frameskip_interval)
++         pl_rearmed_cbs.fskip_force = 1;
++   }
++
++   /* If frameskip/timing settings have changed,
++    * update frontend audio latency
++    * > Can do this before or after the frameskip
++    *   check, but doing it after means we at least
++    *   retain the current frame's audio output */
++   if (update_audio_latency)
++   {
++      environ_cb(RETRO_ENVIRONMENT_SET_MINIMUM_AUDIO_LATENCY,
++            &retro_audio_latency);
++      update_audio_latency = false;
++   }
++
+    input_poll_cb();
+ 
+    update_input();
+@@ -2532,6 +2667,13 @@ void retro_run(void)
+    stop = 0;
+    psxCpu->Execute();
+ 
++   if (pl_rearmed_cbs.fskip_dirty == 1) {
++      if (frameskip_counter < frameskip_interval)
++         frameskip_counter++;
++      else if (frameskip_counter >= frameskip_interval || !pl_rearmed_cbs.fskip_force)
++         frameskip_counter = 0;
++   }
++
+    video_cb((vout_fb_dirty || !vout_can_dupe || !duping_enable) ? vout_buf_ptr : NULL,
+        vout_width, vout_height, vout_width * 2);
+    vout_fb_dirty = 0;
+@@ -2844,6 +2986,14 @@ void retro_deinit(void)
+    /* Have to reset disks struct, otherwise
+     * fnames/flabels will leak memory */
+    disk_init();
++   frameskip_type             = 0;
++   frameskip_threshold        = 0;
++   frameskip_counter          = 0;
++   retro_audio_buff_active    = false;
++   retro_audio_buff_occupancy = 0;
++   retro_audio_buff_underrun  = false;
++   retro_audio_latency        = 0;
++   update_audio_latency       = false;
+ }
+ 
+ #ifdef VITA
+diff --git a/frontend/libretro_core_options.h b/frontend/libretro_core_options.h
+index 813e30a..a1b85d4 100644
+--- a/frontend/libretro_core_options.h
++++ b/frontend/libretro_core_options.h
+@@ -51,17 +51,61 @@ extern "C" {
+ 
+ struct retro_core_option_definition option_defs_us[] = {
+    {
+-      "pcsx_rearmed_frameskip",
++      "pcsx_rearmed_frameskip_type",
+       "Frameskip",
+-      "Choose how much frames should be skipped to improve performance at the expense of visual smoothness.",
++      "Skip frames to avoid audio buffer under-run (crackling). Improves performance at the expense of visual smoothness. 'Auto' skips frames when advised by the frontend. 'Auto (Threshold)' utilises the 'Frameskip Threshold (%)' setting. 'Fixed Interval' utilises the 'Frameskip Interval' setting.",
+       {
+-         { "0", NULL },
+-         { "1", NULL },
+-         { "2", NULL },
+-         { "3", NULL },
++         { "disabled",       NULL },
++         { "auto",           "Auto" },
++         { "auto_threshold", "Auto (Threshold)" },
++         { "fixed_interval", "Fixed Interval" },
+          { NULL, NULL },
+       },
+-      "0",
++      "disabled"
++   },
++   {
++      "pcsx_rearmed_frameskip_threshold",
++      "Frameskip Threshold (%)",
++      "When 'Frameskip' is set to 'Auto (Threshold)', specifies the audio buffer occupancy threshold (percentage) below which frames will be skipped. Higher values reduce the risk of crackling by causing frames to be dropped more frequently.",
++      {
++         { "15", NULL },
++         { "18", NULL },
++         { "21", NULL },
++         { "24", NULL },
++         { "27", NULL },
++         { "30", NULL },
++         { "33", NULL },
++         { "36", NULL },
++         { "39", NULL },
++         { "42", NULL },
++         { "45", NULL },
++         { "48", NULL },
++         { "51", NULL },
++         { "54", NULL },
++         { "57", NULL },
++         { "60", NULL },
++         { NULL, NULL },
++      },
++      "33"
++   },
++   {
++      "pcsx_rearmed_frameskip",
++      "Frameskip Interval",
++      "Specifies the maximum number of frames that can be skipped before a new frame is rendered.",
++      {
++         { "1",  NULL },
++         { "2",  NULL },
++         { "3",  NULL },
++         { "4",  NULL },
++         { "5",  NULL },
++         { "6",  NULL },
++         { "7",  NULL },
++         { "8",  NULL },
++         { "9",  NULL },
++         { "10", NULL },
++         { NULL, NULL },
++      },
++      "1"
+    },
+    {
+       "pcsx_rearmed_bios",
+diff --git a/frontend/plugin_lib.h b/frontend/plugin_lib.h
+index 71dfcb5..7caa87c 100644
+--- a/frontend/plugin_lib.h
++++ b/frontend/plugin_lib.h
+@@ -70,6 +70,8 @@ struct rearmed_cbs {
+ 	// gpu options
+ 	int   frameskip;
+ 	int   fskip_advice;
++	int   fskip_force;
++	int   fskip_dirty;
+ 	unsigned int *gpu_frame_count;
+ 	unsigned int *gpu_hcnt;
+ 	unsigned int flip_cnt; // increment manually if not using pl_vout_flip
+diff --git a/plugins/gpulib/gpu.c b/plugins/gpulib/gpu.c
+index ed37b71..f89e52d 100644
+--- a/plugins/gpulib/gpu.c
++++ b/plugins/gpulib/gpu.c
+@@ -90,6 +90,8 @@ static noinline void update_height(void)
+ 
+ static noinline void decide_frameskip(void)
+ {
++  *gpu.frameskip.dirty = 1;
++
+   if (gpu.frameskip.active)
+     gpu.frameskip.cnt++;
+   else {
+@@ -97,7 +99,9 @@ static noinline void decide_frameskip(void)
+     gpu.frameskip.frame_ready = 1;
+   }
+ 
+-  if (!gpu.frameskip.active && *gpu.frameskip.advice)
++  if (*gpu.frameskip.force)
++    gpu.frameskip.active = 1;
++  else if (!gpu.frameskip.active && *gpu.frameskip.advice)
+     gpu.frameskip.active = 1;
+   else if (gpu.frameskip.set > 0 && gpu.frameskip.cnt < gpu.frameskip.set)
+     gpu.frameskip.active = 1;
+@@ -805,6 +809,8 @@ void GPUrearmedCallbacks(const struct rearmed_cbs *cbs)
+ {
+   gpu.frameskip.set = cbs->frameskip;
+   gpu.frameskip.advice = &cbs->fskip_advice;
++  gpu.frameskip.force = &cbs->fskip_force;
++  gpu.frameskip.dirty = &cbs->fskip_dirty;
+   gpu.frameskip.active = 0;
+   gpu.frameskip.frame_ready = 1;
+   gpu.state.hcnt = cbs->gpu_hcnt;
+diff --git a/plugins/gpulib/gpu.h b/plugins/gpulib/gpu.h
+index 64d2eec..d1a3a75 100644
+--- a/plugins/gpulib/gpu.h
++++ b/plugins/gpulib/gpu.h
+@@ -90,6 +90,8 @@ struct psx_gpu {
+     uint32_t allow:1;
+     uint32_t frame_ready:1;
+     const int *advice;
++    const int *force;
++    int *dirty;
+     uint32_t last_flip_frame;
+     uint32_t pending_fill[3];
+   } frameskip;
diff --git a/patches/pcsx_rearmed/1000-trimui-support.patch b/patches/pcsx_rearmed/1000-trimui-support.patch
index 2b8c6e6..cfab089 100644
--- a/patches/pcsx_rearmed/1000-trimui-support.patch
+++ b/patches/pcsx_rearmed/1000-trimui-support.patch
@@ -12,7 +12,7 @@ index a01c4df..3d08eea 100644
  ifeq ($(platform), $(filter $(platform), vita ctr))
  CFLAGS += -O3 -DNDEBUG
 diff --git a/Makefile.libretro b/Makefile.libretro
-index 1ecd359..7faf5c7 100644
+index 1ecd359..432d700 100644
 --- a/Makefile.libretro
 +++ b/Makefile.libretro
 @@ -347,6 +347,27 @@ else ifeq ($(platform), rpi4_64)
@@ -25,7 +25,7 @@ index 1ecd359..7faf5c7 100644
 +	CXX = $(CROSS_COMPILE)g++
 +
 +	CFLAGS += -mcpu=arm926ej-s -mtune=arm926ej-s
-+	CFLAGS += -DGPULIB_USE_MMAP -DGPU_UNAI_USE_INT_DIV_MULTINV
++	CFLAGS += -DGPULIB_USE_MMAP -DGPU_UNAI_USE_INT_DIV_MULTINV -D_TRIMUI
 +	CFLAGS += -ffast-math -fdata-sections -ffunction-sections -fsingle-precision-constant -flto -fno-PIC
 +	LDFLAGS += -flto
 +	ifeq (,$(DEBUG))
@@ -57,3 +57,29 @@ index 1ecd359..7faf5c7 100644
  # enable large file support if available
  ifeq ($(shell $(CC) -E -dD $(CFLAGS) include/arm_features.h | grep __SIZEOF_LONG__ | awk '{print $$3}'),4)
  CFLAGS += -D_FILE_OFFSET_BITS=64
+diff --git a/frontend/libretro.c b/frontend/libretro.c
+index 59e986e..b2b8a49 100644
+--- a/frontend/libretro.c
++++ b/frontend/libretro.c
+@@ -2802,7 +2802,7 @@ void retro_init(void)
+     * we have to do this because cache misses and some IO penalties
+     * are not emulated. Warning: changing this may break compatibility. */
+    cycle_multiplier = 175;
+-#if defined(HAVE_PRE_ARMV7) && !defined(_3DS)
++#if defined(HAVE_PRE_ARMV7) && !defined(_3DS) && !defined(_TRIMUI)
+    cycle_multiplier = 200;
+ #endif
+    pl_rearmed_cbs.gpu_peops.iUseDither = 1;
+diff --git a/frontend/main.c b/frontend/main.c
+index d3c7d40..7610146 100644
+--- a/frontend/main.c
++++ b/frontend/main.c
+@@ -154,7 +154,7 @@ void emu_set_default_config(void)
+ 	spu_config.iVolume = 768;
+ 	spu_config.iTempo = 0;
+ 	spu_config.iUseThread = 1; // no effect if only 1 core is detected
+-#if defined(HAVE_PRE_ARMV7) && !defined(_3DS) /* XXX GPH hack */
++#if defined(HAVE_PRE_ARMV7) && !defined(_3DS) && !defined(_TRIMUI) /* XXX GPH hack */
+ 	spu_config.iUseReverb = 0;
+ 	spu_config.iUseInterpolation = 0;
+ 	spu_config.iTempo = 1;
diff --git a/plat_sdl.c b/plat_sdl.c
index ec5b683..395227a 100644
--- a/plat_sdl.c
+++ b/plat_sdl.c
@@ -273,6 +273,9 @@ float plat_sound_capacity(void)
 void plat_sound_write(const struct audio_frame *data, int frames)
 {
 	int consumed = 0;
+	if (audio.buf_len == 0)
+		return;
+
 	SDL_LockAudio();
 
 	while (frames > 0) {