From 580c74c3e71204a321ce185a3d8a7f7c799608e8 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Tue, 7 Apr 2020 23:34:01 -0700 Subject: [PATCH] Audio: Remove latency setting. This setting only changes some internal values that are shown in tests not to match PSP behavior. Removed, it now matches how the PSP works. This setting wasn't really affecting any actual audio latency. See #11844. --- Core/Config.cpp | 1 - Core/Config.h | 1 - Core/HLE/__sceAudio.cpp | 31 ++++--------------------------- UI/GameSettingsScreen.cpp | 3 --- headless/Headless.cpp | 1 - libretro/libretro.cpp | 3 --- 6 files changed, 4 insertions(+), 36 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 31f8e26474..4096e3ca41 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -785,7 +785,6 @@ static ConfigSetting graphicsSettings[] = { static ConfigSetting soundSettings[] = { ConfigSetting("Enable", &g_Config.bEnableSound, true, true, true), ConfigSetting("AudioBackend", &g_Config.iAudioBackend, 0, true, true), - ConfigSetting("AudioLatency", &g_Config.iAudioLatency, 1, true, true), ConfigSetting("ExtraAudioBuffering", &g_Config.bExtraAudioBuffering, false, true, false), ConfigSetting("AudioResampler", &g_Config.bAudioResampler, true, true, true), ConfigSetting("GlobalVolume", &g_Config.iGlobalVolume, VOLUME_MAX, true, true), diff --git a/Core/Config.h b/Core/Config.h index c2d3d4738f..ebc2cfbaf6 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -212,7 +212,6 @@ public: // Sound bool bEnableSound; - int iAudioLatency; // 0 = low , 1 = medium(default) , 2 = high int iAudioBackend; int iGlobalVolume; int iAltSpeedVolume; diff --git a/Core/HLE/__sceAudio.cpp b/Core/HLE/__sceAudio.cpp index b6e7179ea1..31573526ad 100644 --- a/Core/HLE/__sceAudio.cpp +++ b/Core/HLE/__sceAudio.cpp @@ -53,12 +53,6 @@ AudioDebugStats g_AudioDebugStats; // atomic locks are used on the lock. TODO: make this lock-free std::atomic_flag atomicLock_; -enum latency { - LOW_LATENCY = 0, - MEDIUM_LATENCY = 1, - HIGH_LATENCY = 2, -}; - int eventAudioUpdate = -1; int eventHostAudioUpdate = -1; int mixFrequency = 44100; @@ -110,27 +104,10 @@ void __AudioInit() { mixFrequency = 44100; srcFrequency = 0; - switch (g_Config.iAudioLatency) { - case LOW_LATENCY: - chanQueueMaxSizeFactor = 1; - chanQueueMinSizeFactor = 1; - hwBlockSize = 16; - hostAttemptBlockSize = 256; - break; - case MEDIUM_LATENCY: - chanQueueMaxSizeFactor = 2; - chanQueueMinSizeFactor = 1; - hwBlockSize = 64; - hostAttemptBlockSize = 512; - break; - case HIGH_LATENCY: - chanQueueMaxSizeFactor = 4; - chanQueueMinSizeFactor = 2; - hwBlockSize = 64; - hostAttemptBlockSize = 512; - break; - - } + chanQueueMaxSizeFactor = 2; + chanQueueMinSizeFactor = 1; + hwBlockSize = 64; + hostAttemptBlockSize = 512; __AudioCPUMHzChange(); diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 2ab1e6beb5..cce96c14c0 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -542,9 +542,6 @@ void GameSettingsScreen::CreateViews() { audioSettings->Add(new CheckBox(&g_Config.bAutoAudioDevice, a->T("Switch on new audio device"))); #endif - static const char *latency[] = { "Low", "Medium", "High" }; - PopupMultiChoice *lowAudio = audioSettings->Add(new PopupMultiChoice(&g_Config.iAudioLatency, a->T("Audio Latency"), latency, 0, ARRAY_SIZE(latency), gr->GetName(), screenManager())); - lowAudio->SetEnabledPtr(&g_Config.bEnableSound); #if defined(__ANDROID__) CheckBox *extraAudio = audioSettings->Add(new CheckBox(&g_Config.bExtraAudioBuffering, a->T("AudioBufferingForBluetooth", "Bluetooth-friendly buffer (slower)"))); extraAudio->SetEnabledPtr(&g_Config.bEnableSound); diff --git a/headless/Headless.cpp b/headless/Headless.cpp index e4bf04fa66..02b65dd53c 100644 --- a/headless/Headless.cpp +++ b/headless/Headless.cpp @@ -392,7 +392,6 @@ int main(int argc, const char* argv[]) g_Config.bHighQualityDepth = true; g_Config.bMemStickInserted = true; g_Config.bFragmentTestCache = true; - g_Config.iAudioLatency = 1; g_Config.bEnableWlan = true; g_Config.sMACAddress = "12:34:56:78:9A:BC"; diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp index ea277d64b6..4df14d381a 100644 --- a/libretro/libretro.cpp +++ b/libretro/libretro.cpp @@ -170,7 +170,6 @@ static RetroOption ppsspp_rendering_mode("ppsspp_rendering_mode", "Renderin static RetroOption ppsspp_auto_frameskip("ppsspp_auto_frameskip", "Auto Frameskip", false); static RetroOption ppsspp_frameskip("ppsspp_frameskip", "Frameskip", 0, 10); static RetroOption ppsspp_frameskiptype("ppsspp_frameskiptype", "Frameskip Type", 0, 10); -static RetroOption ppsspp_audio_latency("ppsspp_audio_latency", "Audio latency", { "low", "medium", "high" }); static RetroOption ppsspp_internal_resolution("ppsspp_internal_resolution", "Internal Resolution (restart)", 1, { "480x272", "960x544", "1440x816", "1920x1088", "2400x1360", "2880x1632", "3360x1904", "3840x2176", "4320x2448", "4800x2720" }); static RetroOption ppsspp_button_preference("ppsspp_button_preference", "Confirmation Button", { { "cross", PSP_SYSTEMPARAM_BUTTON_CROSS }, { "circle", PSP_SYSTEMPARAM_BUTTON_CIRCLE } }); static RetroOption ppsspp_fast_memory("ppsspp_fast_memory", "Fast Memory (Speedhack)", true); @@ -196,7 +195,6 @@ void retro_set_environment(retro_environment_t cb) { vars.push_back(ppsspp_auto_frameskip.GetOptions()); vars.push_back(ppsspp_frameskip.GetOptions()); vars.push_back(ppsspp_frameskiptype.GetOptions()); - vars.push_back(ppsspp_audio_latency.GetOptions()); vars.push_back(ppsspp_internal_resolution.GetOptions()); vars.push_back(ppsspp_button_preference.GetOptions()); vars.push_back(ppsspp_fast_memory.GetOptions()); @@ -265,7 +263,6 @@ static void check_variables(CoreParameter &coreParam) { ppsspp_gpu_hardware_transform.Update(&g_Config.bHardwareTransform); ppsspp_frameskip.Update(&g_Config.iFrameSkip); ppsspp_frameskiptype.Update(&g_Config.iFrameSkipType); - ppsspp_audio_latency.Update(&g_Config.iAudioLatency); ppsspp_auto_frameskip.Update(&g_Config.bAutoFrameSkip); ppsspp_block_transfer_gpu.Update(&g_Config.bBlockTransferGPU); ppsspp_texture_filtering.Update(&g_Config.iTexFiltering);