stuff/suyu
stuff/suyu
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu.git synced 2024-11-22 10:51:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #10027 from bylaws/master

Browse source 
Add some explicit latency to sample count reporting
This commit is contained in:
liamwhite 2023-04-10 09:23:48 -04:00 committed by GitHub
commit 4f77275cd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/audio_core/sink/sink_stream.cpp
View file

@ -252,8 +252,7 @@ void SinkStream::ProcessAudioOutAndRender(std::span<s16> output_buffer, std::siz
{ {
std::scoped_lock lk{sample_count_lock}; std::scoped_lock lk{sample_count_lock};
last_sample_count_update_time = last_sample_count_update_time = system.CoreTiming().GetGlobalTimeNs();
Core::Timing::CyclesToUs(system.CoreTiming().GetClockTicks());
min_played_sample_count = max_played_sample_count; min_played_sample_count = max_played_sample_count;
max_played_sample_count += actual_frames_written; max_played_sample_count += actual_frames_written;
} }
@ -261,12 +260,13 @@ void SinkStream::ProcessAudioOutAndRender(std::span<s16> output_buffer, std::siz
u64 SinkStream::GetExpectedPlayedSampleCount() { u64 SinkStream::GetExpectedPlayedSampleCount() {
std::scoped_lock lk{sample_count_lock}; 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 time_delta{cur_time - last_sample_count_update_time};
auto exp_played_sample_count{min_played_sample_count + auto exp_played_sample_count{min_played_sample_count +
(TargetSampleRate * time_delta) / std::chrono::seconds{1}}; (TargetSampleRate * time_delta) / std::chrono::seconds{1}};
return std::min<u64>(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<u64>(exp_played_sample_count, max_played_sample_count) + TargetSampleCount * 3;
} }
void SinkStream::WaitFreeSpace() { void SinkStream::WaitFreeSpace() {

2
src/audio_core/sink/sink_stream.h
View file

@ -246,7 +246,7 @@ private:
/// Maximum number of total samples that can be played since the last callback /// Maximum number of total samples that can be played since the last callback
u64 max_played_sample_count{}; u64 max_played_sample_count{};
/// The time the two above tracking variables were last written to /// 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 /// Set by the audio render/in/out system which uses this stream
f32 system_volume{1.0f}; f32 system_volume{1.0f};
/// Set via IAudioDevice service calls /// Set via IAudioDevice service calls