From afb6bc73c7ce522190b19ec3e3c8a14eb264bdeb Mon Sep 17 00:00:00 2001 From: DarthMew Date: Sun, 1 Oct 2023 00:22:22 +0200 Subject: [PATCH] Add 'Use Alternative Audio Hook' option, enable by default --- src/core/settings.cpp | 2 ++ src/core/settings.h | 2 ++ src/libretro/libretro_audio_stream.cpp | 32 ++++++++++++++++++------ src/libretro/libretro_audio_stream.h | 2 ++ src/libretro/libretro_core_options.h | 13 ++++++++++ src/libretro/libretro_host_interface.cpp | 12 +++++++++ 6 files changed, 55 insertions(+), 8 deletions(-) diff --git a/src/core/settings.cpp b/src/core/settings.cpp index bad7a9cc..1f3fa782 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -143,6 +143,8 @@ void Settings::Load(SettingsInterface& si) apply_game_settings = si.GetBoolValue("Main", "ApplyGameSettings", true); runahead_frames = static_cast(si.GetIntValue("Main", "RunaheadFrameCount", 0)); + audio_fast_hook = si.GetBoolValue("Audio", "FastHook", true); + cpu_execution_mode = ParseCPUExecutionMode( si.GetStringValue("CPU", "ExecutionMode", GetCPUExecutionModeName(DEFAULT_CPU_EXECUTION_MODE)).c_str()) diff --git a/src/core/settings.h b/src/core/settings.h index ef0b8cfb..a03a948d 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -58,6 +58,8 @@ struct Settings ConsoleRegion region = ConsoleRegion::Auto; + bool audio_fast_hook = true; + CPUExecutionMode cpu_execution_mode = CPUExecutionMode::Interpreter; u32 cpu_overclock_numerator = 1; u32 cpu_overclock_denominator = 1; diff --git a/src/libretro/libretro_audio_stream.cpp b/src/libretro/libretro_audio_stream.cpp index 0c324873..0eed9f18 100644 --- a/src/libretro/libretro_audio_stream.cpp +++ b/src/libretro/libretro_audio_stream.cpp @@ -11,16 +11,32 @@ LibretroAudioStream::LibretroAudioStream() = default; LibretroAudioStream::~LibretroAudioStream() = default; +void LibretroAudioStream::UploadToFrontend() +{ + std::array output_buffer; + u32 total_samples = 0; + while (const auto num_samples = m_buffer.GetContiguousSize()) { + const auto write_pos = output_buffer.begin() + total_samples; + std::copy_n(m_buffer.GetReadPointer(), num_samples, write_pos); + m_buffer.Remove(num_samples); + total_samples += num_samples; + } + g_retro_audio_sample_batch_callback(output_buffer.data(), total_samples / AUDIO_CHANNELS); +} + void LibretroAudioStream::FramesAvailable() { - for (;;) + if (!g_settings.audio_fast_hook) { - const u32 num_samples = m_buffer.GetContiguousSize(); - if (num_samples == 0) - break; + for (;;) + { + const u32 num_samples = m_buffer.GetContiguousSize(); + if (num_samples == 0) + break; - const u32 num_frames = num_samples / AUDIO_CHANNELS; - g_retro_audio_sample_batch_callback(m_buffer.GetReadPointer(), num_frames); - m_buffer.Remove(num_samples); + const u32 num_frames = num_samples / AUDIO_CHANNELS; + g_retro_audio_sample_batch_callback(m_buffer.GetReadPointer(), num_frames); + m_buffer.Remove(num_samples); + } } -} \ No newline at end of file +} diff --git a/src/libretro/libretro_audio_stream.h b/src/libretro/libretro_audio_stream.h index 78e87960..489f9eb3 100644 --- a/src/libretro/libretro_audio_stream.h +++ b/src/libretro/libretro_audio_stream.h @@ -9,6 +9,8 @@ public: LibretroAudioStream(); ~LibretroAudioStream(); + void UploadToFrontend(); + protected: void FramesAvailable() override; }; diff --git a/src/libretro/libretro_core_options.h b/src/libretro/libretro_core_options.h index 4ec1b1fe..4193c92d 100644 --- a/src/libretro/libretro_core_options.h +++ b/src/libretro/libretro_core_options.h @@ -2034,6 +2034,19 @@ struct retro_core_option_v2_definition option_defs_us[] = { {NULL, NULL}, }, "false"}, + {"swanstation_Audio_FastHook", + "Use Alternative Audio Hook (Restart)", + NULL, + "Use a faster and more efficient to submit audio samples to the frontend. Mostly safe to enable, but may hang " + "for a select few games that rely on the old method to function. Requires the core to be restarted to apply.", + NULL, + "advanced", + { + {"true", "Enabled"}, + {"false", "Disabled"}, + {NULL, NULL}, + }, + "true"}, {NULL, NULL, NULL, NULL, NULL, NULL, {{NULL, NULL}}, NULL}, }; diff --git a/src/libretro/libretro_host_interface.cpp b/src/libretro/libretro_host_interface.cpp index b010df7b..4d66854b 100644 --- a/src/libretro/libretro_host_interface.cpp +++ b/src/libretro/libretro_host_interface.cpp @@ -697,6 +697,12 @@ void LibretroHostInterface::retro_run_frame() UpdateGeometry(); m_display->Render(); + + if (g_settings.audio_fast_hook) + { + auto* const audio_stream = dynamic_cast(m_audio_stream.get()); + audio_stream->UploadToFrontend(); + } } unsigned LibretroHostInterface::retro_get_region() @@ -1153,6 +1159,12 @@ void LibretroHostInterface::UpdateSettings() g_settings.gpu_use_software_renderer_for_readbacks = old_settings.gpu_use_software_renderer_for_readbacks; } + + if (g_settings.audio_fast_hook != old_settings.audio_fast_hook) + { + ReportFormattedMessage("Changing audio hook will apply on core reload."); + g_settings.audio_fast_hook = old_settings.audio_fast_hook; + } } CheckForSettingsChanges(old_settings);