"Merge Tagged PR 3345"

This commit is contained in:
yuzubot committed 2020-04-03 12:01:11 +00:00
1 parent 0d4ca5a8fc
commit db66423bb9
11 files changed
+48 -13

No files matched your search

+7 -2
View File
@@ -11,8 +11,10 @@
#include "audio_core/stream.h"
#include "common/assert.h"
#include "common/logging/log.h"
#include "core/core.h"
#include "core/core_timing.h"
#include "core/core_timing_util.h"
#include "core/perf_stats.h"
#include "core/settings.h"
namespace AudioCore {
@@ -61,8 +63,11 @@ Stream::State Stream::GetState() const {
s64 Stream::GetBufferReleaseCycles(const Buffer& buffer) const {
const std::size_t num_samples{buffer.GetSamples().size() / GetNumChannels()};
const auto us =
std::chrono::microseconds((static_cast<u64>(num_samples) * 1000000) / sample_rate);
const double time_scale{Settings::values.enable_realtime_audio
? Core::System::GetInstance().GetPerfStats().GetLastFrameTimeScale()
: 1.0f};
const auto us{std::chrono::microseconds(
(static_cast<u64>(num_samples) * static_cast<u64>(1000000 / time_scale)) / sample_rate)};
return Core::Timing::usToCycles(us);
}