libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-09 11:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LIBRETRO: always use auto framerate reduction and drop setting

Browse Source
This commit is contained in:
Giovanni Cascione 2023-04-07 19:36:10 +02:00
parent 7460d2c3d7
commit fd754d3f2a
4 changed files with 17 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backends/platform/libretro/include/libretro-core-options-intl.h
View File

@ -221,18 +221,6 @@ struct retro_core_option_v2_definition option_defs_it[] = {
}, },
NULL NULL
}, },
{
"scummvm_reduce_framerate_type",
"Riduzione del framerate",
NULL,
"Riduce temporaneamente il framerate quando viene rilevato un audio buffer underrun.",
NULL,
NULL,
{
{ NULL, NULL },
},
NULL
},
{ {
"scummvm_auto_performance_tuner", "scummvm_auto_performance_tuner",
"Regolazione automatica performance", "Regolazione automatica performance",

14
backends/platform/libretro/include/libretro-core-options.h
View File

@ -290,20 +290,6 @@ struct retro_core_option_v2_definition option_defs_us[] = {
}, },
"disabled" "disabled"
}, },
{
"scummvm_reduce_framerate_type",
"Reduce framerate",
NULL,
"Temporarily reduces the framerate as needed when audio buffer underrun is detected.",
NULL,
"timing",
{
{"disabled", NULL},
{"enabled", NULL},
{ NULL, NULL },
},
"disabled"
},
{ {
"scummvm_auto_performance_tuner", "scummvm_auto_performance_tuner",
"Auto performance tuner", "Auto performance tuner",

6
backends/platform/libretro/include/os.h
View File

@ -37,16 +37,14 @@
#define PERF_SWITCH_FRAMESKIP_EVENTS REFRESH_RATE / 2 #define PERF_SWITCH_FRAMESKIP_EVENTS REFRESH_RATE / 2
#define PERF_SWITCH_ON (1 << 0) #define PERF_SWITCH_ON (1 << 0)
#define PERF_SWITCH_ENABLE_TIMING_INACCURACIES (1 << 1) #define PERF_SWITCH_ENABLE_TIMING_INACCURACIES (1 << 1)
#define PERF_SWITCH_ENABLE_REDUCE_FRAMERATE (1 << 2) #define PERF_SWITCH_DISABLE_CONSECUTIVE_SCREEN_UPDATES (1 << 2)
#define PERF_SWITCH_DISABLE_CONSECUTIVE_SCREEN_UPDATES (1 << 3) #define PERF_SWITCH_OVER (1 << 3)
#define PERF_SWITCH_OVER (1 << 4)
#define PERF_SWITCH_RESET_THRESHOLD 60 #define PERF_SWITCH_RESET_THRESHOLD 60
#define PERF_SWITCH_RESET_REST REFRESH_RATE * 30 #define PERF_SWITCH_RESET_REST REFRESH_RATE * 30
// Reduce framerate // Reduce framerate
#define REDUCE_FRAMERATE_REST REFRESH_RATE / 2 #define REDUCE_FRAMERATE_REST REFRESH_RATE / 2
#define REDUCE_FRAMERATE_SHIFT_MAX 2 #define REDUCE_FRAMERATE_SHIFT_MAX 2
#define REDUCE_FRAMERATE_SHIFT_AUTO 1
// Thread switch caller // Thread switch caller
#define THREAD_SWITCH_POLL (1 << 0) #define THREAD_SWITCH_POLL (1 << 0)

69
backends/platform/libretro/src/libretro.cpp
View File

@ -140,23 +140,7 @@ static void retro_audio_buff_status_cb(bool active, unsigned occupancy, bool und
retro_audio_buff_occupancy = occupancy; retro_audio_buff_occupancy = occupancy;
} }
static void set_audio_buffer_status() {
if (frameskip_type > 1 || (performance_switch & PERF_SWITCH_ON) || reduce_framerate_type) {
struct retro_audio_buffer_status_callback buf_status_cb;
buf_status_cb.callback = retro_audio_buff_status_cb;
audio_status = environ_cb(RETRO_ENVIRONMENT_SET_AUDIO_BUFFER_STATUS_CALLBACK, &buf_status_cb) ? (audio_status | AUDIO_STATUS_BUFFER_SUPPORT) : (audio_status & ~AUDIO_STATUS_BUFFER_SUPPORT);
} else {
audio_status = environ_cb(RETRO_ENVIRONMENT_SET_AUDIO_BUFFER_STATUS_CALLBACK, NULL) ? (audio_status | AUDIO_STATUS_BUFFER_SUPPORT) : (audio_status & ~AUDIO_STATUS_BUFFER_SUPPORT);
}
}
static void increase_performance() { static void increase_performance() {
if (!(performance_switch & PERF_SWITCH_ENABLE_REDUCE_FRAMERATE)) {
performance_switch |= PERF_SWITCH_ENABLE_REDUCE_FRAMERATE;
log_cb(RETRO_LOG_DEBUG, "Auto performance tuner: 'Auto reduce framerate' enabled.\n");
return;
}
if (!(performance_switch & PERF_SWITCH_DISABLE_CONSECUTIVE_SCREEN_UPDATES)) { if (!(performance_switch & PERF_SWITCH_DISABLE_CONSECUTIVE_SCREEN_UPDATES)) {
performance_switch |= PERF_SWITCH_DISABLE_CONSECUTIVE_SCREEN_UPDATES; performance_switch |= PERF_SWITCH_DISABLE_CONSECUTIVE_SCREEN_UPDATES;
log_cb(RETRO_LOG_DEBUG, "Auto performance tuner: 'Disable consecutive screen updates' enabled.\n"); log_cb(RETRO_LOG_DEBUG, "Auto performance tuner: 'Disable consecutive screen updates' enabled.\n");
@ -187,12 +171,6 @@ static void increase_accuracy() {
log_cb(RETRO_LOG_DEBUG, "Auto performance tuner: 'Disable consecutive screen updates' disabled.\n"); log_cb(RETRO_LOG_DEBUG, "Auto performance tuner: 'Disable consecutive screen updates' disabled.\n");
return; return;
} }
if (performance_switch & PERF_SWITCH_ENABLE_REDUCE_FRAMERATE) {
performance_switch &= ~PERF_SWITCH_ENABLE_REDUCE_FRAMERATE;
log_cb(RETRO_LOG_DEBUG, "Auto performance tuner: 'Auto reduce framerate' disabled.\n");
return;
}
} }
void reset_performance_tuner() { void reset_performance_tuner() {
@ -279,15 +257,6 @@ static void update_variables(void) {
frameskip_type = 3; frameskip_type = 3;
} }
var.key = "scummvm_reduce_framerate_type";
var.value = NULL;
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) {
if (strcmp(var.value, "disabled") == 0)
reduce_framerate_type = 0;
else
reduce_framerate_type = REDUCE_FRAMERATE_SHIFT_AUTO;
}
var.key = "scummvm_auto_performance_tuner"; var.key = "scummvm_auto_performance_tuner";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) {
if (strcmp(var.value, "enabled") == 0) { if (strcmp(var.value, "enabled") == 0) {
@ -308,8 +277,6 @@ static void update_variables(void) {
consecutive_screen_updates = true; consecutive_screen_updates = true;
} }
set_audio_buffer_status();
if (!(audio_status & AUDIO_STATUS_BUFFER_SUPPORT)) { if (!(audio_status & AUDIO_STATUS_BUFFER_SUPPORT)) {
if (frameskip_type > 1) { if (frameskip_type > 1) {
log_cb(RETRO_LOG_WARN, "Selected frameskip mode not available.\n"); log_cb(RETRO_LOG_WARN, "Selected frameskip mode not available.\n");
@ -318,13 +285,6 @@ static void update_variables(void) {
frameskip_type = 0; frameskip_type = 0;
} }
if (reduce_framerate_type == REDUCE_FRAMERATE_SHIFT_AUTO) {
log_cb(RETRO_LOG_WARN, "Auto reduce framerate not available.\n");
retro_msg.msg = "Auto reduce framerate not available";
environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE_EXT, &retro_msg);
reduce_framerate_type = 0;
}
if (performance_switch) { if (performance_switch) {
log_cb(RETRO_LOG_WARN, "Auto performance tuner not available.\n"); log_cb(RETRO_LOG_WARN, "Auto performance tuner not available.\n");
retro_msg.msg = "Auto performance tuner not available"; retro_msg.msg = "Auto performance tuner not available";
@ -507,13 +467,15 @@ void retro_init(void) {
else else
log_cb = NULL; log_cb = NULL;
environ_cb(RETRO_ENVIRONMENT_GET_CAN_DUPE, &can_dupe);
struct retro_audio_buffer_status_callback buf_status_cb;
buf_status_cb.callback = retro_audio_buff_status_cb;
audio_status = environ_cb(RETRO_ENVIRONMENT_SET_AUDIO_BUFFER_STATUS_CALLBACK, &buf_status_cb) ? (audio_status | AUDIO_STATUS_BUFFER_SUPPORT) : (audio_status & ~AUDIO_STATUS_BUFFER_SUPPORT);
frame_rate = environ_cb(RETRO_ENVIRONMENT_GET_TARGET_REFRESH_RATE, &frame_rate) ? frame_rate : REFRESH_RATE; frame_rate = environ_cb(RETRO_ENVIRONMENT_GET_TARGET_REFRESH_RATE, &frame_rate) ? frame_rate : REFRESH_RATE;
audio_buffer_init(SAMPLE_RATE, (uint16) frame_rate); audio_buffer_init(SAMPLE_RATE, (uint16) frame_rate);
update_variables(); update_variables();
environ_cb(RETRO_ENVIRONMENT_GET_CAN_DUPE, &can_dupe);
cmd_params_num = 1; cmd_params_num = 1;
strcpy(cmd_params[0], "scummvm\0"); strcpy(cmd_params[0], "scummvm\0");
@ -792,20 +754,19 @@ void retro_run(void) {
samples_count = 0; samples_count = 0;
if (audio_video_enable & 2) { if (audio_video_enable & 2) {
/* Framerate reduction using sound buffer size */ /* Framerate reduction using sound buffer size */
if (reduce_framerate_type == REDUCE_FRAMERATE_SHIFT_AUTO || (performance_switch & PERF_SWITCH_ENABLE_REDUCE_FRAMERATE) || (getThreadSwitchCaller() & THREAD_SWITCH_UPDATE)) { if ((audio_status & (AUDIO_STATUS_BUFFER_SUPPORT | AUDIO_STATUS_MUTE | AUDIO_STATUS_BUFFER_UNDERRUN)) == (AUDIO_STATUS_BUFFER_SUPPORT | AUDIO_STATUS_BUFFER_UNDERRUN)) {
if ((audio_status & AUDIO_STATUS_BUFFER_UNDERRUN) && !(audio_status & AUDIO_STATUS_MUTE)) { if (reduce_framerate_shift < REDUCE_FRAMERATE_SHIFT_MAX)
if (reduce_framerate_shift < REDUCE_FRAMERATE_SHIFT_MAX) reduce_framerate_shift++;
reduce_framerate_shift++; reduce_framerate_countdown = REDUCE_FRAMERATE_REST;
reduce_framerate_countdown = REDUCE_FRAMERATE_REST;
}
if (reduce_framerate_countdown)
reduce_framerate_countdown--;
else
reduce_framerate_shift = 0;
} else {
reduce_framerate_shift = 0;
} }
if (reduce_framerate_countdown)
reduce_framerate_countdown--;
else if (getThreadSwitchCaller() & THREAD_SWITCH_UPDATE)
reduce_framerate_shift = REDUCE_FRAMERATE_SHIFT_MAX;
else
reduce_framerate_shift = 0;
samples_count = ((Audio::MixerImpl *)g_system->getMixer())->mixCallback((byte *) sound_buffer, samples_per_frame_buffer_size << reduce_framerate_shift); samples_count = ((Audio::MixerImpl *)g_system->getMixer())->mixCallback((byte *) sound_buffer, samples_per_frame_buffer_size << reduce_framerate_shift);
} }
audio_status = samples_count ? (audio_status & ~AUDIO_STATUS_MUTE) : (audio_status | AUDIO_STATUS_MUTE); audio_status = samples_count ? (audio_status & ~AUDIO_STATUS_MUTE) : (audio_status | AUDIO_STATUS_MUTE);