mirror/psxrecomp
1
0
Fork 0
mirror of https://github.com/RetroPortingToolKit/psxrecomp synced 2026-10-26 02:11:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #187 from mstan/split/pr169-load-accel-audio-sink

Browse Source 
runtime: sink audio during accelerated loads
This commit is contained in:
Matt Stanley
2026-08-24 22:43:41 -07:00
committed by GitHub
parent 979e5e330c 1391dedb0c
commit 1ea6a45066
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/main.cpp
+8
View File
@@ -1869,6 +1869,7 @@ int g_turbo_audio_sink_enabled = 0;
int g_turbo_audio_sink_active = 0;
uint64_t g_turbo_audio_sink_frames = 0; /* guest SPU frames advanced, not queued */
}
static int g_turbo_audio_sink_config_enabled = 0;
/* The CD predicate already excludes XA and holds across ordinary inter-file
* gaps. A short engage debounce rejects a one-frame controller blip without
* leaving a visible authentic-paced prefix on every real load. Once engaged,
@@ -10671,6 +10672,7 @@ int main(int argc, char** argv) {
gc.runtime.has_offer_turbo_loads ? "offer_turbo_loads" : "");
}
if (gc.runtime.turbo_audio_sink) {
g_turbo_audio_sink_config_enabled = 1;
g_turbo_audio_sink_enabled = 1;
std::fprintf(stdout,
"psxrecomp: turbo_audio_sink enabled (opt-in)\n");
@@ -12274,6 +12276,7 @@ int main(int argc, char** argv) {
g_mod_load_release_frames = -1;
g_mod_disc_speed_divisor = -1;
g_mod_disc_instant_rate = -1;
g_turbo_audio_sink_enabled = g_turbo_audio_sink_config_enabled;
g_turbo_load_wall_multiplier = 0;
g_turbo_load_release_frames = TURBO_LOADS_RELEASE_FRAMES;
if (!turbo_loads_offered)
@@ -12289,6 +12292,11 @@ int main(int argc, char** argv) {
g_turbo_loads_enabled = 1;
g_turbo_load_wall_multiplier = g_mod_load_wall_multiplier;
g_turbo_load_release_frames = g_mod_load_release_frames;
/* Fast Loading advances the guest at a host rate greater than real
* time. Keep the canonical SPU/CD stream running, but discard the
* accelerated presentation-side audio until pacing resumes; otherwise
* the SDL bridge overflows and the load becomes observably unstable. */
g_turbo_audio_sink_enabled = g_turbo_load_wall_multiplier > 1;
if (g_turbo_load_wall_multiplier) {
std::fprintf(stdout,
"psxrecomp: mod selected %dx load acceleration "
runtime/tests/test_mod_load_acceleration.py
+2 -2
View File
@@ -31,7 +31,7 @@ assert 'runtime.contains("offer_turbo_loads")' in CONFIG_CPP
assert "rt.has_turbo_loads = true;" in CONFIG_CPP
assert "constexpr bool turbo_loads_offered = false;" in MAIN
assert "turbo_loads_offered = gc.runtime.offer_turbo_loads;" not in MAIN
assert "gi.has_turbo_loads = turbo_loads_offered ? 1 : 0;" in MAIN
assert "gi->has_turbo_loads = turbo_loads_offered_b ? 1 : 0;" in MAIN
assert "Turbo loads is mod-owned on PSX" in MAIN
# game.toml [runtime] turbo_loads must not enable anything, only warn.
@@ -72,7 +72,7 @@ assert (
assert "release_run = g_turbo_load_release_frames;" in MAIN
assert "g_frame_period_ms / (double)g_turbo_load_wall_multiplier" in MAIN
assert "if (!turbo_load_paced && g_frame_period_ms > 0.0)" in MAIN
assert "if (!manual_turbo_active && !turbo_load_paced && present_should_wall_pace())" in MAIN
assert "if (g_mod_disc_speed_divisor >= 0)" in MAIN
print("mod-owned load acceleration guard passed")