Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

audio_core: Only perform audio stretching if below full speed. (#7201)

Browse source
This commit is contained in:
Steveice10 2023-11-26 12:06:59 -08:00 • committed by GitHub
parent c0ecdb689d
commit 670e9936a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 83 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/core/perf_stats.cpp
View file

@ -47,13 +47,13 @@ PerfStats::~PerfStats() {
}
void PerfStats::BeginSystemFrame() {
std::lock_guard lock{object_mutex};
std::scoped_lock lock{object_mutex};
frame_begin = Clock::now();
}
void PerfStats::EndSystemFrame() {
std::lock_guard lock{object_mutex};
std::scoped_lock lock{object_mutex};
auto frame_end = Clock::now();
const auto frame_time = frame_end - frame_begin;
@ -69,13 +69,13 @@ void PerfStats::EndSystemFrame() {
}
void PerfStats::EndGameFrame() {
std::lock_guard lock{object_mutex};
std::scoped_lock lock{object_mutex};
game_frames += 1;
}
double PerfStats::GetMeanFrametime() const {
std::lock_guard lock{object_mutex};
std::scoped_lock lock{object_mutex};
if (current_index <= IgnoreFrames) {
return 0;
@ -87,7 +87,7 @@ double PerfStats::GetMeanFrametime() const {
}
PerfStats::Results PerfStats::GetAndResetStats(microseconds current_system_time_us) {
std::lock_guard lock(object_mutex);
std::scoped_lock lock{object_mutex};
const auto now = Clock::now();
// Walltime elapsed since stats were reset
@ -95,12 +95,11 @@ PerfStats::Results PerfStats::GetAndResetStats(microseconds current_system_time_
const auto system_us_per_second = (current_system_time_us - reset_point_system_us) / interval;
Results results{};
results.system_fps = static_cast<double>(system_frames) / interval;
results.game_fps = static_cast<double>(game_frames) / interval;
results.frametime = duration_cast<DoubleSecs>(accumulated_frametime).count() /
static_cast<double>(system_frames);
results.emulation_speed = system_us_per_second.count() / 1'000'000.0;
last_stats.system_fps = static_cast<double>(system_frames) / interval;
last_stats.game_fps = static_cast<double>(game_frames) / interval;
last_stats.frametime = duration_cast<DoubleSecs>(accumulated_frametime).count() /
static_cast<double>(system_frames);
last_stats.emulation_speed = system_us_per_second.count() / 1'000'000.0;
// Reset counters
reset_point = now;
@ -109,11 +108,17 @@ PerfStats::Results PerfStats::GetAndResetStats(microseconds current_system_time_
system_frames = 0;
game_frames = 0;
return results;
return last_stats;
}
PerfStats::Results PerfStats::GetLastStats() {
std::scoped_lock lock{object_mutex};
return last_stats;
}
double PerfStats::GetLastFrameTimeScale() const {
std::lock_guard lock{object_mutex};
std::scoped_lock lock{object_mutex};
constexpr double FRAME_LENGTH = 1.0 / GPU::SCREEN_REFRESH_RATE;
return duration_cast<DoubleSecs>(previous_frame_length).count() / FRAME_LENGTH;