VERY experimental Nintendo Switch 2 emulator
C++
audio_core: No longer stall when sink queue is full
Billy Laws1794a33c52df
diff --git a/src/audio_core/sink/cubeb_sink.cpp b/src/audio_core/sink/cubeb_sink.cppindex 9133f53884..9a08018888 100644--- a/src/audio_core/sink/cubeb_sink.cpp+++ b/src/audio_core/sink/cubeb_sink.cpp@@ -101,8 +101,6 @@ public:~CubebSinkStream() override {LOG_DEBUG(Service_Audio, "Destructing cubeb stream {}", name);- Unstall();-if (!ctx) {return;}@@ -143,8 +141,6 @@ public:* Stop the sink stream.*/void Stop() override {- Unstall();-if (!ctx || paused) {return;}diff --git a/src/audio_core/sink/sdl2_sink.cpp b/src/audio_core/sink/sdl2_sink.cppindex c138dc628e..ee1a0652f3 100644--- a/src/audio_core/sink/sdl2_sink.cpp+++ b/src/audio_core/sink/sdl2_sink.cpp@@ -88,7 +88,6 @@ public:* Finalize the sink stream.*/void Finalize() override {- Unstall();if (device == 0) {return;}@@ -116,7 +115,6 @@ public:* Stop the sink stream.*/void Stop() override {- Unstall();if (device == 0 || paused) {return;}diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cppindex 084ac5edfe..f99dbd8ec7 100644--- a/src/audio_core/sink/sink_stream.cpp+++ b/src/audio_core/sink/sink_stream.cpp@@ -151,10 +151,6 @@ void SinkStream::ProcessAudioIn(std::span<const s16> input_buffer, std::size_t nreturn;}- if (queued_buffers > max_queue_size) {- Stall();- }-while (frames_written < num_frames) {// If the playing buffer has been consumed or has no frames, we need a new oneif (playing_buffer.consumed || playing_buffer.frames == 0) {@@ -189,10 +185,6 @@ void SinkStream::ProcessAudioIn(std::span<const s16> input_buffer, std::size_t n}std::memcpy(&last_frame[0], &input_buffer[(frames_written - 1) * frame_size], frame_size_bytes);-- if (queued_buffers <= max_queue_size) {- Unstall();- }}void SinkStream::ProcessAudioOutAndRender(std::span<s16> output_buffer, std::size_t num_frames) {@@ -216,20 +208,6 @@ void SinkStream::ProcessAudioOutAndRender(std::span<s16> output_buffer, std::sizreturn;}- // Due to many frames being queued up with nvdec (5 frames or so?), a lot of buffers also get- // queued up (30+) but not all at once, which causes constant stalling here, so just let the- // video play out without attempting to stall.- // Can hopefully remove this later with a more complete NVDEC implementation.- const auto nvdec_active{system.AudioCore().IsNVDECActive()};-- // Core timing cannot be paused in single-core mode, so Stall ends up being called over and over- // and never recovers to a normal state, so just skip attempting to sync things on single-core.- if (system.IsMulticore() && !nvdec_active && queued_buffers > max_queue_size) {- Stall();- } else if (system.IsMulticore() && queued_buffers <= max_queue_size) {- Unstall();- }-while (frames_written < num_frames) {// If the playing buffer has been consumed or has no frames, we need a new oneif (playing_buffer.consumed || playing_buffer.frames == 0) {@@ -279,27 +257,6 @@ void SinkStream::ProcessAudioOutAndRender(std::span<s16> output_buffer, std::sizmin_played_sample_count = max_played_sample_count;max_played_sample_count += actual_frames_written;}-- if (system.IsMulticore() && queued_buffers <= max_queue_size) {- Unstall();- }-}--void SinkStream::Stall() {- std::scoped_lock lk{stall_guard};- if (stalled_lock) {- return;- }- stalled_lock = system.StallApplication();-}--void SinkStream::Unstall() {- std::scoped_lock lk{stall_guard};- if (!stalled_lock) {- return;- }- system.UnstallApplication();- stalled_lock.unlock();}u64 SinkStream::GetExpectedPlayedSampleCount() {diff --git a/src/audio_core/sink/sink_stream.h b/src/audio_core/sink/sink_stream.hindex 9806e6d986..23e289c7bd 100644--- a/src/audio_core/sink/sink_stream.h+++ b/src/audio_core/sink/sink_stream.h@@ -55,9 +55,7 @@ struct SinkBuffer {class SinkStream {public:explicit SinkStream(Core::System& system_, StreamType type_) : system{system_}, type{type_} {}- virtual ~SinkStream() {- Unstall();- }+ virtual ~SinkStream() {}/*** Finalize the sink stream.@@ -202,16 +200,6 @@ public:*/void ProcessAudioOutAndRender(std::span<s16> output_buffer, std::size_t num_frames);- /**- * Stall core processes if the audio thread falls too far behind.- */- void Stall();-- /**- * Unstall core processes.- */- void Unstall();-/*** Get the total number of samples expected to have been played by this stream.*@@ -266,8 +254,6 @@ private:/// Signalled when ring buffer entries are consumedstd::condition_variable release_cv;std::mutex release_mutex;- std::mutex stall_guard;- std::unique_lock<std::mutex> stalled_lock;};using SinkStreamPtr = std::unique_ptr<SinkStream>;