ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 4de290dc6f into 1ae0b23265

This commit is contained in:
Tygyh 2025-04-19 20:50:13 +02:00 committed by GitHub
parent 1ae0b23265 4de290dc6f
commit ffa5315ff3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
19 changed files with 235 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/AudioCommon/AlsaSoundStream.cpp
View File

@ -77,9 +77,21 @@ void AlsaSound::SoundLoop()
m_thread_status.store(ALSAThreadStatus::STOPPED);
}
bool AlsaSound::SetRunning(bool running)
bool AlsaSound::Start()
{
m_thread_status.store(running ? ALSAThreadStatus::RUNNING : ALSAThreadStatus::PAUSED);
m_thread_status.store(ALSAThreadStatus::RUNNING);
// Immediately lock and unlock mutex to prevent cv race.
std::unique_lock<std::mutex>{cv_m}.unlock();
// Notify thread that status has changed
cv.notify_one();
return true;
}
bool AlsaSound::Stop()
{
m_thread_status.store(ALSAThreadStatus::PAUSED);
// Immediately lock and unlock mutex to prevent cv race.
std::unique_lock<std::mutex>{cv_m}.unlock();

3
Source/Core/AudioCommon/AlsaSoundStream.h
View File

@ -23,7 +23,8 @@ public:
~AlsaSound() override;
bool Init() override;
bool SetRunning(bool running) override;
bool Start() override;
bool Stop() override;
static bool IsValid() { return true; }

37
Source/Core/AudioCommon/AudioCommon.cpp
View File

@ -73,7 +73,7 @@ void PostInitSoundStream(Core::System& system)
// This needs to be called after AudioInterface::Init and SerialInterface::Init (for GBA devices)
// where input sample rates are set
UpdateSoundStream(system);
SetSoundStreamRunning(system, true);
StartSoundStream(system);
if (Config::Get(Config::MAIN_DUMP_AUDIO) && !system.IsAudioDumpStarted())
StartAudioDump(system);
@ -86,7 +86,7 @@ void ShutdownSoundStream(Core::System& system)
if (Config::Get(Config::MAIN_DUMP_AUDIO) && system.IsAudioDumpStarted())
StopAudioDump(system);
SetSoundStreamRunning(system, false);
StopSoundStream(system);
system.SetSoundStream(nullptr);
INFO_LOG_FMT(AUDIO, "Done shutting down sound stream");
@ -172,23 +172,40 @@ void UpdateSoundStream(Core::System& system)
}
}
void SetSoundStreamRunning(Core::System& system, bool running)
void StartSoundStream(Core::System& system)
{
SoundStream* sound_stream = system.GetSoundStream();
if (!sound_stream)
return;
if (system.IsSoundStreamRunning() == running)
if (system.IsSoundStreamRunning())
return;
system.SetSoundStreamRunning(running);
if (sound_stream->SetRunning(running))
system.StartSoundStream();
if (sound_stream->Start())
return;
if (running)
ERROR_LOG_FMT(AUDIO, "Error starting stream.");
else
ERROR_LOG_FMT(AUDIO, "Error stopping stream.");
ERROR_LOG_FMT(AUDIO, "Error starting stream.");
}
void StopSoundStream(Core::System& system)
{
SoundStream* sound_stream = system.GetSoundStream();
if (!sound_stream)
return;
if (!system.IsSoundStreamRunning())
return;
system.StopSoundStream();
if (sound_stream->Stop())
return;
ERROR_LOG_FMT(AUDIO, "Error stopping stream.");
}
void SendAIBuffer(Core::System& system, const short* samples, unsigned int num_samples)

3
Source/Core/AudioCommon/AudioCommon.h
View File

@ -30,7 +30,8 @@ bool SupportsDPL2Decoder(std::string_view backend);
bool SupportsLatencyControl(std::string_view backend);
bool SupportsVolumeChanges(std::string_view backend);
void UpdateSoundStream(Core::System& system);
void SetSoundStreamRunning(Core::System& system, bool running);
void StartSoundStream(Core::System& system);
void StopSoundStream(Core::System& system);
void SendAIBuffer(Core::System& system, const short* samples, unsigned int num_samples);
void StartAudioDump(Core::System& system);
void StopAudioDump(Core::System& system);

29
Source/Core/AudioCommon/CubebStream.cpp
View File

@ -105,8 +105,9 @@ bool CubebStream::Init()
return return_value;
}
bool CubebStream::SetRunning(bool running)
bool CubebStream::Start()
{
bool running = true;
bool return_value = false;
#ifdef _WIN32
@ -116,10 +117,28 @@ bool CubebStream::SetRunning(bool running)
m_work_queue.EmplaceItem([this, running, &return_value, &sync_event] {
Common::ScopeGuard sync_event_guard([&sync_event] { sync_event.Set(); });
#endif
if (running)
return_value = cubeb_stream_start(m_stream) == CUBEB_OK;
else
return_value = cubeb_stream_stop(m_stream) == CUBEB_OK;
return_value = cubeb_stream_start(m_stream) == CUBEB_OK;
#ifdef _WIN32
});
sync_event.Wait();
#endif
return return_value;
}
bool CubebStream::Stop()
{
bool running = false;
bool return_value = false;
#ifdef _WIN32
if (!m_coinit_success)
return false;
Common::Event sync_event;
m_work_queue.EmplaceItem([this, running, &return_value, &sync_event] {
Common::ScopeGuard sync_event_guard([&sync_event] { sync_event.Set(); });
#endif
return_value = cubeb_stream_stop(m_stream) == CUBEB_OK;
#ifdef _WIN32
});
sync_event.Wait();

3
Source/Core/AudioCommon/CubebStream.h
View File

@ -26,7 +26,8 @@ public:
CubebStream& operator=(CubebStream&& other) = delete;
~CubebStream() override;
bool Init() override;
bool SetRunning(bool running) override;
bool Start() override;
bool Stop() override;
void SetVolume(int) override;
static bool IsValid() { return true; }

7
Source/Core/AudioCommon/NullSoundStream.cpp
View File

@ -8,7 +8,12 @@ bool NullSound::Init()
return true;
}
bool NullSound::SetRunning(bool running)
bool NullSound::Start()
{
return true;
}
bool NullSound::Stop()
{
return true;
}

3
Source/Core/AudioCommon/NullSoundStream.h
View File

@ -9,7 +9,8 @@ class NullSound final : public SoundStream
{
public:
bool Init() override;
bool SetRunning(bool running) override;
bool Start() override;
bool Stop() override;
void SetVolume(int volume) override;
static bool IsValid() { return true; }

17
Source/Core/AudioCommon/OpenALStream.cpp
View File

@ -153,16 +153,15 @@ void OpenALStream::SetVolume(int volume)
palSourcef(m_source, AL_GAIN, m_volume);
}
bool OpenALStream::SetRunning(bool running)
bool OpenALStream::Start()
{
if (running)
{
palSourcePlay(m_source);
}
else
{
palSourceStop(m_source);
}
palSourcePlay(m_source);
return true;
}
bool OpenALStream::Stop()
{
palSourceStop(m_source);
return true;
}

3
Source/Core/AudioCommon/OpenALStream.h
View File

@ -57,7 +57,8 @@ public:
~OpenALStream() override;
bool Init() override;
void SetVolume(int volume) override;
bool SetRunning(bool running) override;
bool Start() override;
bool Stop() override;
static bool IsValid();

10
Source/Core/AudioCommon/OpenSLESStream.cpp
View File

@ -137,10 +137,14 @@ OpenSLESStream::~OpenSLESStream()
}
}
bool OpenSLESStream::SetRunning(bool running)
bool OpenSLESStream::Start()
{
SLuint32 new_state = running ? SL_PLAYSTATE_PLAYING : SL_PLAYSTATE_PAUSED;
return (*bqPlayerPlay)->SetPlayState(bqPlayerPlay, new_state) == SL_RESULT_SUCCESS;
return (*bqPlayerPlay)->SetPlayState(bqPlayerPlay, SL_PLAYSTATE_PLAYING) == SL_RESULT_SUCCESS;
}
bool OpenSLESStream::Stop()
{
return (*bqPlayerPlay)->SetPlayState(bqPlayerPlay, SL_PLAYSTATE_PAUSED) == SL_RESULT_SUCCESS;
}
void OpenSLESStream::SetVolume(int volume)

3
Source/Core/AudioCommon/OpenSLESStream.h
View File

@ -14,7 +14,8 @@ class OpenSLESStream final : public SoundStream
public:
~OpenSLESStream() override;
bool Init() override;
bool SetRunning(bool running) override;
bool Start() override;
bool Stop() override;
void SetVolume(int volume) override;
static bool IsValid() { return true; }

3
Source/Core/AudioCommon/PulseAudioStream.h
View File

@ -20,7 +20,8 @@ public:
~PulseAudio() override;
bool Init() override;
bool SetRunning(bool running) override { return true; }
bool Start() override { return true; }
bool Stop() override { return true; }
static bool IsValid() { return true; }
void StateCallback(pa_context* c);
void WriteCallback(pa_stream* s, size_t length);

3
Source/Core/AudioCommon/SoundStream.h
View File

@ -21,5 +21,6 @@ public:
virtual bool Init() { return false; }
virtual void SetVolume(int) {}
// Returns true if successful.
virtual bool SetRunning(bool running) { return false; }
virtual bool Start() { return false; }
virtual bool Stop() { return false; }
};

242
Source/Core/AudioCommon/WASAPIStream.cpp
View File

@ -168,150 +168,150 @@ bool WASAPIStream::Init()
return true;
}
bool WASAPIStream::SetRunning(bool running)
bool WASAPIStream::Start()
{
if (running)
ComPtr<IMMDevice> device;
HRESULT result;
if (Config::Get(Config::MAIN_WASAPI_DEVICE) == "default")
{
ComPtr<IMMDevice> device;
result = m_enumerator->GetDefaultAudioEndpoint(eRender, eConsole, device.GetAddressOf());
}
else
{
result = S_OK;
device = GetDeviceByName(Config::Get(Config::MAIN_WASAPI_DEVICE));
HRESULT result;
if (Config::Get(Config::MAIN_WASAPI_DEVICE) == "default")
if (!device)
{
ERROR_LOG_FMT(AUDIO, "Can't find device '{}', falling back to default",
Config::Get(Config::MAIN_WASAPI_DEVICE));
result = m_enumerator->GetDefaultAudioEndpoint(eRender, eConsole, device.GetAddressOf());
}
else
{
result = S_OK;
device = GetDeviceByName(Config::Get(Config::MAIN_WASAPI_DEVICE));
}
if (!device)
{
ERROR_LOG_FMT(AUDIO, "Can't find device '{}', falling back to default",
Config::Get(Config::MAIN_WASAPI_DEVICE));
result = m_enumerator->GetDefaultAudioEndpoint(eRender, eConsole, device.GetAddressOf());
}
}
if (!HandleWinAPI("Failed to obtain default endpoint", result))
return false;
if (!HandleWinAPI("Failed to obtain default endpoint", result))
// Show a friendly name in the log
ComPtr<IPropertyStore> device_properties;
result = device->OpenPropertyStore(STGM_READ, device_properties.GetAddressOf());
if (!HandleWinAPI("Failed to initialize IPropertyStore", result))
return false;
wil::unique_prop_variant device_name;
device_properties->GetValue(PKEY_Device_FriendlyName, device_name.addressof());
INFO_LOG_FMT(AUDIO, "Using audio endpoint '{}'", TStrToUTF8(device_name.pwszVal));
ComPtr<IAudioClient> audio_client;
// Get IAudioDevice
result = device->Activate(__uuidof(IAudioClient), CLSCTX_INPROC_SERVER, nullptr,
reinterpret_cast<LPVOID*>(audio_client.GetAddressOf()));
if (!HandleWinAPI("Failed to activate IAudioClient", result))
return false;
REFERENCE_TIME device_period = 0;
result = audio_client->GetDevicePeriod(nullptr, &device_period);
device_period += Config::Get(Config::MAIN_AUDIO_LATENCY) * (10000 / m_format.Format.nChannels);
INFO_LOG_FMT(AUDIO, "Audio period set to {}", device_period);
if (!HandleWinAPI("Failed to obtain device period", result))
return false;
result = audio_client->Initialize(
AUDCLNT_SHAREMODE_EXCLUSIVE,
AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST, device_period,
device_period, reinterpret_cast<WAVEFORMATEX*>(&m_format), nullptr);
if (result == AUDCLNT_E_UNSUPPORTED_FORMAT)
{
OSD::AddMessage("Your current audio device doesn't support 16-bit 48000 hz PCM audio. WASAPI "
"exclusive mode won't work.",
6000U);
return false;
}
if (result == AUDCLNT_E_BUFFER_SIZE_NOT_ALIGNED)
{
result = audio_client->GetBufferSize(&m_frames_in_buffer);
if (!HandleWinAPI("Failed to get aligned buffer size", result))
return false;
// Show a friendly name in the log
ComPtr<IPropertyStore> device_properties;
result = device->OpenPropertyStore(STGM_READ, device_properties.GetAddressOf());
if (!HandleWinAPI("Failed to initialize IPropertyStore", result))
return false;
wil::unique_prop_variant device_name;
device_properties->GetValue(PKEY_Device_FriendlyName, device_name.addressof());
INFO_LOG_FMT(AUDIO, "Using audio endpoint '{}'", TStrToUTF8(device_name.pwszVal));
ComPtr<IAudioClient> audio_client;
// Get IAudioDevice
result = device->Activate(__uuidof(IAudioClient), CLSCTX_INPROC_SERVER, nullptr,
reinterpret_cast<LPVOID*>(audio_client.GetAddressOf()));
reinterpret_cast<LPVOID*>(audio_client.ReleaseAndGetAddressOf()));
if (!HandleWinAPI("Failed to activate IAudioClient", result))
if (!HandleWinAPI("Failed to reactivate IAudioClient", result))
return false;
REFERENCE_TIME device_period = 0;
result = audio_client->GetDevicePeriod(nullptr, &device_period);
device_period += Config::Get(Config::MAIN_AUDIO_LATENCY) * (10000 / m_format.Format.nChannels);
INFO_LOG_FMT(AUDIO, "Audio period set to {}", device_period);
if (!HandleWinAPI("Failed to obtain device period", result))
return false;
device_period =
static_cast<REFERENCE_TIME>(
10000.0 * 1000 * m_frames_in_buffer / m_format.Format.nSamplesPerSec + 0.5) +
Config::Get(Config::MAIN_AUDIO_LATENCY) * 10000;
result = audio_client->Initialize(
AUDCLNT_SHAREMODE_EXCLUSIVE,
AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST, device_period,
device_period, reinterpret_cast<WAVEFORMATEX*>(&m_format), nullptr);
if (result == AUDCLNT_E_UNSUPPORTED_FORMAT)
{
OSD::AddMessage("Your current audio device doesn't support 16-bit 48000 hz PCM audio. WASAPI "
"exclusive mode won't work.",
6000U);
return false;
}
if (result == AUDCLNT_E_BUFFER_SIZE_NOT_ALIGNED)
{
result = audio_client->GetBufferSize(&m_frames_in_buffer);
if (!HandleWinAPI("Failed to get aligned buffer size", result))
return false;
// Get IAudioDevice
result = device->Activate(__uuidof(IAudioClient), CLSCTX_INPROC_SERVER, nullptr,
reinterpret_cast<LPVOID*>(audio_client.ReleaseAndGetAddressOf()));
if (!HandleWinAPI("Failed to reactivate IAudioClient", result))
return false;
device_period =
static_cast<REFERENCE_TIME>(
10000.0 * 1000 * m_frames_in_buffer / m_format.Format.nSamplesPerSec + 0.5) +
Config::Get(Config::MAIN_AUDIO_LATENCY) * 10000;
result = audio_client->Initialize(
AUDCLNT_SHAREMODE_EXCLUSIVE,
AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST, device_period,
device_period, reinterpret_cast<WAVEFORMATEX*>(&m_format), nullptr);
}
if (!HandleWinAPI("Failed to initialize IAudioClient", result))
return false;
result = audio_client->GetBufferSize(&m_frames_in_buffer);
if (!HandleWinAPI("Failed to get buffer size from IAudioClient", result))
return false;
ComPtr<IAudioRenderClient> audio_renderer;
result = audio_client->GetService(IID_PPV_ARGS(audio_renderer.GetAddressOf()));
if (!HandleWinAPI("Failed to get IAudioRenderClient from IAudioClient", result))
return false;
wil::unique_event_nothrow need_data_event;
need_data_event.create();
audio_client->SetEventHandle(need_data_event.get());
result = audio_client->Start();
if (!HandleWinAPI("Failed to get IAudioRenderClient from IAudioClient", result))
return false;
INFO_LOG_FMT(AUDIO, "WASAPI: Successfully initialized!");
// "Commit" audio client and audio renderer now
m_audio_client = std::move(audio_client);
m_audio_renderer = std::move(audio_renderer);
m_need_data_event = std::move(need_data_event);
m_running.store(true, std::memory_order_relaxed);
m_thread = std::thread(&WASAPIStream::SoundLoop, this);
}
else
{
m_running.store(false, std::memory_order_relaxed);
if (m_thread.joinable())
m_thread.join();
if (!HandleWinAPI("Failed to initialize IAudioClient", result))
return false;
m_need_data_event.reset();
m_audio_renderer.Reset();
m_audio_client.Reset();
}
result = audio_client->GetBufferSize(&m_frames_in_buffer);
if (!HandleWinAPI("Failed to get buffer size from IAudioClient", result))
return false;
ComPtr<IAudioRenderClient> audio_renderer;
result = audio_client->GetService(IID_PPV_ARGS(audio_renderer.GetAddressOf()));
if (!HandleWinAPI("Failed to get IAudioRenderClient from IAudioClient", result))
return false;
wil::unique_event_nothrow need_data_event;
need_data_event.create();
audio_client->SetEventHandle(need_data_event.get());
result = audio_client->Start();
if (!HandleWinAPI("Failed to get IAudioRenderClient from IAudioClient", result))
return false;
INFO_LOG_FMT(AUDIO, "WASAPI: Successfully initialized!");
// "Commit" audio client and audio renderer now
m_audio_client = std::move(audio_client);
m_audio_renderer = std::move(audio_renderer);
m_need_data_event = std::move(need_data_event);
m_running.store(true, std::memory_order_relaxed);
m_thread = std::thread(&WASAPIStream::SoundLoop, this);
return true;
}
bool WASAPIStream::Stop()
{
m_running.store(false, std::memory_order_relaxed);
if (m_thread.joinable())
m_thread.join();
m_need_data_event.reset();
m_audio_renderer.Reset();
m_audio_client.Reset();
return true;
}

3
Source/Core/AudioCommon/WASAPIStream.h
View File

@ -34,7 +34,8 @@ public:
explicit WASAPIStream();
~WASAPIStream();
bool Init() override;
bool SetRunning(bool running) override;
bool Start() override;
bool Stop() override;
static bool IsValid();
static std::vector<std::string> GetAvailableDevices();

2
Source/Core/Core/HW/CPU.cpp
View File

@ -232,7 +232,7 @@ void CPUManager::RunAdjacentSystems(bool running)
m_system.GetFifo().EmulatorState(running);
// Core is responsible for shutting down the sound stream.
if (m_state != State::PowerDown)
AudioCommon::SetSoundStreamRunning(m_system, running);
running ? AudioCommon::StartSoundStream(m_system) : AudioCommon::StopSoundStream(m_system);
}
void CPUManager::Stop()

9
Source/Core/Core/System.cpp
View File

@ -128,9 +128,14 @@ bool System::IsSoundStreamRunning() const
return m_impl->m_sound_stream_running;
}
void System::SetSoundStreamRunning(bool running)
void System::StartSoundStream()
{
m_impl->m_sound_stream_running = running;
m_impl->m_sound_stream_running = true;
}
void System::StopSoundStream()
{
m_impl->m_sound_stream_running = false;
}
bool System::IsAudioDumpStarted() const

3
Source/Core/Core/System.h
View File

@ -151,7 +151,8 @@ public:
SoundStream* GetSoundStream() const;
void SetSoundStream(std::unique_ptr<SoundStream> sound_stream);
bool IsSoundStreamRunning() const;
void SetSoundStreamRunning(bool running);
void StartSoundStream();
void StopSoundStream();
bool IsAudioDumpStarted() const;
void SetAudioDumpStarted(bool started);