Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core_timing: Make use of std::chrono with ScheduleEvent

Browse source
This commit is contained in:
Lioncash 2020-07-15 18:30:06 -04:00
parent 263200f982
commit 8b50c660df
13 changed files with 58 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/audio_core/stream.cpp
View file

@ -59,11 +59,9 @@ Stream::State Stream::GetState() const {
return state;
}
s64 Stream::GetBufferReleaseNS(const Buffer& buffer) const {
std::chrono::nanoseconds Stream::GetBufferReleaseNS(const Buffer& buffer) const {
const std::size_t num_samples{buffer.GetSamples().size() / GetNumChannels()};
const auto ns =
std::chrono::nanoseconds((static_cast<u64>(num_samples) * 1000000000ULL) / sample_rate);
return ns.count();
return std::chrono::nanoseconds((static_cast<u64>(num_samples) * 1000000000ULL) / sample_rate);
}
static void VolumeAdjustSamples(std::vector<s16>& samples, float game_volume) {
@ -105,10 +103,10 @@ void Stream::PlayNextBuffer(s64 cycles_late) {
sink_stream.EnqueueSamples(GetNumChannels(), active_buffer->GetSamples());
core_timing.ScheduleEvent(
GetBufferReleaseNS(*active_buffer) -
(Settings::values.enable_audio_stretching.GetValue() ? 0 : cycles_late),
release_event, {});
const auto time_stretch_delta = std::chrono::nanoseconds{
Settings::values.enable_audio_stretching.GetValue() ? 0 : cycles_late};
const auto future_time = GetBufferReleaseNS(*active_buffer) - time_stretch_delta;
core_timing.ScheduleEvent(future_time, release_event, {});
}
void Stream::ReleaseActiveBuffer(s64 cycles_late) {

6
src/audio_core/stream.h
View file

@ -4,6 +4,7 @@
#pragma once
#include <chrono>
#include <functional>
#include <memory>
#include <string>
@ -96,10 +97,7 @@ private:
void ReleaseActiveBuffer(s64 cycles_late = 0);
/// Gets the number of core cycles when the specified buffer will be released
s64 GetBufferReleaseNS(const Buffer& buffer) const;
/// Gets the number of core cycles when the specified buffer will be released
s64 GetBufferReleaseNSHostTiming(const Buffer& buffer) const;
std::chrono::nanoseconds GetBufferReleaseNS(const Buffer& buffer) const;
u32 sample_rate; ///< Sample rate of the stream
Format format; ///< Format of the stream