From 0afb9631b53de1a747fc9ba46ed37781b04ef492 Mon Sep 17 00:00:00 2001 From: Billy Laws Date: Sun, 2 Apr 2023 17:29:07 +0100 Subject: Add some explicit latency to sample count reporting Some games have very tight scheduling requirements for their audio which can't really be matched on the host, adding a constant to the reported value helps to provide some leeway. --- src/audio_core/sink/sink_stream.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cpp index f99dbd8ec..13c73b5d7 100644 --- a/src/audio_core/sink/sink_stream.cpp +++ b/src/audio_core/sink/sink_stream.cpp @@ -266,7 +266,8 @@ u64 SinkStream::GetExpectedPlayedSampleCount() { auto exp_played_sample_count{min_played_sample_count + (TargetSampleRate * time_delta) / std::chrono::seconds{1}}; - return std::min(exp_played_sample_count, max_played_sample_count); + // Add 15ms of latency in sample reporting to allow for some leeway in scheduler timings + return std::min(exp_played_sample_count, max_played_sample_count) + TargetSampleCount * 3; } void SinkStream::WaitFreeSpace() { -- cgit v1.2.3 From 8908663f1279c690bc19710da7e33d44314641b4 Mon Sep 17 00:00:00 2001 From: Billy Laws Date: Sat, 8 Apr 2023 21:54:19 +0100 Subject: Use GetGlobalTimeNs as opposed to clock ticks --- src/audio_core/sink/sink_stream.cpp | 5 ++--- src/audio_core/sink/sink_stream.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cpp index 13c73b5d7..13ba26e74 100644 --- a/src/audio_core/sink/sink_stream.cpp +++ b/src/audio_core/sink/sink_stream.cpp @@ -252,8 +252,7 @@ void SinkStream::ProcessAudioOutAndRender(std::span output_buffer, std::siz { std::scoped_lock lk{sample_count_lock}; - last_sample_count_update_time = - Core::Timing::CyclesToUs(system.CoreTiming().GetClockTicks()); + last_sample_count_update_time = system.CoreTiming().GetGlobalTimeNs(); min_played_sample_count = max_played_sample_count; max_played_sample_count += actual_frames_written; } @@ -261,7 +260,7 @@ void SinkStream::ProcessAudioOutAndRender(std::span output_buffer, std::siz u64 SinkStream::GetExpectedPlayedSampleCount() { std::scoped_lock lk{sample_count_lock}; - auto cur_time{Core::Timing::CyclesToUs(system.CoreTiming().GetClockTicks())}; + auto cur_time{system.CoreTiming().GetGlobalTimeNs()}; auto time_delta{cur_time - last_sample_count_update_time}; auto exp_played_sample_count{min_played_sample_count + (TargetSampleRate * time_delta) / std::chrono::seconds{1}}; diff --git a/src/audio_core/sink/sink_stream.h b/src/audio_core/sink/sink_stream.h index 23e289c7b..21b5b40a1 100644 --- a/src/audio_core/sink/sink_stream.h +++ b/src/audio_core/sink/sink_stream.h @@ -246,7 +246,7 @@ private: /// Maximum number of total samples that can be played since the last callback u64 max_played_sample_count{}; /// The time the two above tracking variables were last written to - std::chrono::microseconds last_sample_count_update_time{}; + std::chrono::nanoseconds last_sample_count_update_time{}; /// Set by the audio render/in/out system which uses this stream f32 system_volume{1.0f}; /// Set via IAudioDevice service calls -- cgit v1.2.3