[Scummvm-git-logs] scummvm master -> fbac0c281e4d97c807a715eec9408a01b95f3b48

[spleen1981]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3448c9808c LIBRETRO: JANITORIAL: drop unused vars
fbac0c281e LIBRETRO: fix current_frame initial value


Commit: 3448c9808c34a7b2c76647c0078e451bc14ffc85
    https://github.com/scummvm/scummvm/commit/3448c9808c34a7b2c76647c0078e451bc14ffc85
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2023-04-09T00:57:37+02:00

Commit Message:
LIBRETRO: JANITORIAL: drop unused vars

Changed paths:
    backends/platform/libretro/src/libretro.cpp


diff --git a/backends/platform/libretro/src/libretro.cpp b/backends/platform/libretro/src/libretro.cpp
index c5dab707480..31120d8bb80 100644
--- a/backends/platform/libretro/src/libretro.cpp
+++ b/backends/platform/libretro/src/libretro.cpp
@@ -87,16 +87,13 @@ static uint8 frameskip_threshold;
 static uint32 frameskip_counter = 0;
 static uint8 frameskip_events = 0;
 
-static uint8 reduce_framerate_type = 0;
-static uint8 reduce_framerate_shift = 0;
-static uint8 reduce_framerate_countdown = 0;
-
 static bool consecutive_screen_updates = false;
 
 static uint8 audio_status = 0;
 
 static unsigned retro_audio_buff_occupancy = 0;
 
+static uint8 performance_switch = 0;
 static uint32 perf_ref_frame = 0;
 static uint32 perf_ref_audio_buff_occupancy = 0;
 
@@ -106,8 +103,6 @@ static size_t samples_per_frame_buffer_size = 0;
 
 static int16_t *sound_buffer = NULL;       // pointer to output buffer
 
-static uint8 performance_switch = 0;
-
 static void audio_buffer_init(uint16 sample_rate, uint16 frame_rate) {
 	samples_per_frame = sample_rate / frame_rate;
 


Commit: fbac0c281e4d97c807a715eec9408a01b95f3b48
    https://github.com/scummvm/scummvm/commit/fbac0c281e4d97c807a715eec9408a01b95f3b48
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2023-04-09T00:57:37+02:00

Commit Message:
LIBRETRO: fix current_frame initial value

Changed paths:
    backends/platform/libretro/src/libretro.cpp


diff --git a/backends/platform/libretro/src/libretro.cpp b/backends/platform/libretro/src/libretro.cpp
index 31120d8bb80..806739fc547 100644
--- a/backends/platform/libretro/src/libretro.cpp
+++ b/backends/platform/libretro/src/libretro.cpp
@@ -80,7 +80,7 @@ char cmd_params_num;
 int adjusted_RES_W = 0;
 int adjusted_RES_H = 0;
 
-static uint32 current_frame = 1;
+static uint32 current_frame = 0;
 static uint8 frameskip_no;
 static uint8 frameskip_type;
 static uint8 frameskip_threshold;
@@ -715,7 +715,7 @@ void retro_run(void) {
 			if ((frameskip_type == 2) || (performance_switch & PERF_SWITCH_ON))
 				skip_frame = (audio_status & AUDIO_STATUS_BUFFER_UNDERRUN);
 			else if (frameskip_type == 1){
-				skip_frame = !((current_frame - 1) % frameskip_no == 0);
+				skip_frame = !(current_frame % frameskip_no == 0);
 }
 			else if (frameskip_type == 3)
 				skip_frame = (retro_audio_buff_occupancy < frameskip_threshold);
@@ -739,7 +739,7 @@ void retro_run(void) {
 					if (frameskip_events > PERF_SWITCH_FRAMESKIP_EVENTS) {
 						increase_performance();
 						frameskip_events = 0;
-						perf_ref_frame = current_frame - 1;
+						perf_ref_frame = current_frame;
 						perf_ref_audio_buff_occupancy = 0;
 					}
 				}
@@ -749,7 +749,7 @@ void retro_run(void) {
 			if (!skip_frame && (performance_switch & PERF_SWITCH_ON) && performance_switch > PERF_SWITCH_ON) {
 				perf_ref_audio_buff_occupancy += retro_audio_buff_occupancy;
 				if ((current_frame - perf_ref_frame) % (PERF_SWITCH_RESET_REST) == 0) {
-					uint32 avg_audio_buff_occupancy = perf_ref_audio_buff_occupancy / (current_frame - perf_ref_frame);
+					uint32 avg_audio_buff_occupancy = perf_ref_audio_buff_occupancy / (current_frame + 1 - perf_ref_frame);
 					if (avg_audio_buff_occupancy > PERF_SWITCH_RESET_THRESHOLD || avg_audio_buff_occupancy == retro_audio_buff_occupancy)
 						increase_accuracy();
 					perf_ref_frame = current_frame - 1;