diff options
| author | german <german@thesoftwareartisans.com> | 2021-02-02 09:59:59 -0600 |
|---|---|---|
| committer | german <german@thesoftwareartisans.com> | 2021-02-02 10:17:10 -0600 |
| commit | 7784b1da6dcd37027c82e1b980b1e79645f18176 (patch) | |
| tree | 32ce50cc1db92fff2d79b3edd5dbb85c622f4066 | |
| parent | 2489547dc5bfd57ccadc392daff9a1b980a06680 (diff) | |
Prevent over scheduling audio events and terminate properly the motion update event
| -rw-r--r-- | src/audio_core/stream.cpp | 9 | ||||
| -rw-r--r-- | src/core/hle/service/hid/hid.cpp | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/audio_core/stream.cpp b/src/audio_core/stream.cpp index afe68c9ed..f3373fe04 100644 --- a/src/audio_core/stream.cpp +++ b/src/audio_core/stream.cpp @@ -103,7 +103,14 @@ void Stream::PlayNextBuffer(std::chrono::nanoseconds ns_late) { sink_stream.EnqueueSamples(GetNumChannels(), active_buffer->GetSamples()); - core_timing.ScheduleEvent(GetBufferReleaseNS(*active_buffer) - ns_late, release_event, {}); + const auto buffer_release_ns = GetBufferReleaseNS(*active_buffer); + + // If ns_late is higher than the update rate ignore the delay + if (ns_late > buffer_release_ns) { + ns_late = {}; + } + + core_timing.ScheduleEvent(buffer_release_ns - ns_late, release_event, {}); } void Stream::ReleaseActiveBuffer(std::chrono::nanoseconds ns_late) { diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 60e63626d..d86711fea 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -104,6 +104,7 @@ void IAppletResource::DeactivateController(HidController controller) { IAppletResource ::~IAppletResource() { system.CoreTiming().UnscheduleEvent(pad_update_event, 0); + system.CoreTiming().UnscheduleEvent(motion_update_event, 0); } void IAppletResource::GetSharedMemoryHandle(Kernel::HLERequestContext& ctx) { |