summaryrefslogtreecommitdiffstats
path: root/src/audio_core/sink/sink_stream.cpp
diff options
context:
space:
mode:
authorBilly Laws <blaws05@gmail.com>2023-03-26 21:21:04 +0200
committerBilly Laws <blaws05@gmail.com>2023-03-27 23:01:41 +0200
commit530fe24768357d4151ac6c6aca4a0e122ef8260a (patch)
tree8c00084bd414502b7f911274b7ac6bd61626b37c /src/audio_core/sink/sink_stream.cpp
parentRun clang-format (diff)
downloadyuzu-530fe24768357d4151ac6c6aca4a0e122ef8260a.tar
yuzu-530fe24768357d4151ac6c6aca4a0e122ef8260a.tar.gz
yuzu-530fe24768357d4151ac6c6aca4a0e122ef8260a.tar.bz2
yuzu-530fe24768357d4151ac6c6aca4a0e122ef8260a.tar.lz
yuzu-530fe24768357d4151ac6c6aca4a0e122ef8260a.tar.xz
yuzu-530fe24768357d4151ac6c6aca4a0e122ef8260a.tar.zst
yuzu-530fe24768357d4151ac6c6aca4a0e122ef8260a.zip
Diffstat (limited to 'src/audio_core/sink/sink_stream.cpp')
-rw-r--r--src/audio_core/sink/sink_stream.cpp43
1 files changed, 0 insertions, 43 deletions
diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cpp
index 084ac5edf..f99dbd8ec 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 n
return;
}
- 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 one
if (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::siz
return;
}
- // 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 one
if (playing_buffer.consumed || playing_buffer.frames == 0) {
@@ -279,27 +257,6 @@ void SinkStream::ProcessAudioOutAndRender(std::span<s16> output_buffer, std::siz
min_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() {