summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Kelebek12022-09-22 01:21:58 +0100
committerGravatar Kelebek12022-09-22 01:23:57 +0100
commit56b8a9ba6edc6f2225166cad6668dec0c059d706 (patch)
tree4bc46dd61c67de335bea46e8872c78b54915aa59
parentMerge pull request #8849 from Morph1984/parallel-astc (diff)
downloadyuzu-56b8a9ba6edc6f2225166cad6668dec0c059d706.tar.gz
yuzu-56b8a9ba6edc6f2225166cad6668dec0c059d706.tar.xz
yuzu-56b8a9ba6edc6f2225166cad6668dec0c059d706.zip
Do not try to pause core timing from the audio thread when using single-core
Diffstat (limited to '')
-rw-r--r--src/audio_core/sink/sink_stream.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cpp
index 37fe725e4..849f862b0 100644
--- a/src/audio_core/sink/sink_stream.cpp
+++ b/src/audio_core/sink/sink_stream.cpp
@@ -214,8 +214,13 @@ void SinkStream::ProcessAudioOutAndRender(std::span<s16> output_buffer, std::siz
214 // video play out without attempting to stall. 214 // video play out without attempting to stall.
215 // Can hopefully remove this later with a more complete NVDEC implementation. 215 // Can hopefully remove this later with a more complete NVDEC implementation.
216 const auto nvdec_active{system.AudioCore().IsNVDECActive()}; 216 const auto nvdec_active{system.AudioCore().IsNVDECActive()};
217 if (!nvdec_active && queued_buffers > max_queue_size) { 217
218 // Core timing cannot be paused in single-core mode, so Stall ends up being called over and over
219 // and never recovers to a normal state, so just skip attempting to sync things on single-core.
220 if (system.IsMulticore() && !nvdec_active && queued_buffers > max_queue_size) {
218 Stall(); 221 Stall();
222 } else if (system.IsMulticore() && queued_buffers <= max_queue_size) {
223 Unstall();
219 } 224 }
220 225
221 while (frames_written < num_frames) { 226 while (frames_written < num_frames) {
@@ -255,7 +260,7 @@ void SinkStream::ProcessAudioOutAndRender(std::span<s16> output_buffer, std::siz
255 std::memcpy(&last_frame[0], &output_buffer[(frames_written - 1) * frame_size], 260 std::memcpy(&last_frame[0], &output_buffer[(frames_written - 1) * frame_size],
256 frame_size_bytes); 261 frame_size_bytes);
257 262
258 if (stalled && queued_buffers <= max_queue_size) { 263 if (system.IsMulticore() && queued_buffers <= max_queue_size) {
259 Unstall(); 264 Unstall();
260 } 265 }
261} 266}