From b724afb14237eb5d4f7de102f3f2a2b29878123d Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Sun, 9 Apr 2023 01:45:16 +0200 Subject: [PATCH] early-access version 3503 --- README.md | 2 +- src/audio_core/sink/sink_stream.cpp | 5 ++--- src/audio_core/sink/sink_stream.h | 2 +- src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp | 4 ++-- src/yuzu/configuration/configure_general.ui | 2 +- src/yuzu_cmd/default_ini.h | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index e1ef10b09..cf59a280a 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 3502. +This is the source code for early-access 3503. ## Legal Notice diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cpp index 76d61811f..fd33389fe 100755 --- a/src/audio_core/sink/sink_stream.cpp +++ b/src/audio_core/sink/sink_stream.cpp @@ -252,8 +252,7 @@ void SinkStream::ProcessAudioOutAndRender(std::span output_buffer, std::siz { std::scoped_lock lk{sample_count_lock}; - last_sample_count_update_time = - Core::Timing::CyclesToUs(system.CoreTiming().GetClockTicks()); + last_sample_count_update_time = system.CoreTiming().GetGlobalTimeNs(); min_played_sample_count = max_played_sample_count; max_played_sample_count += actual_frames_written; } @@ -261,7 +260,7 @@ void SinkStream::ProcessAudioOutAndRender(std::span output_buffer, std::siz u64 SinkStream::GetExpectedPlayedSampleCount() { 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 exp_played_sample_count{min_played_sample_count + (TargetSampleRate * time_delta) / std::chrono::seconds{1}}; diff --git a/src/audio_core/sink/sink_stream.h b/src/audio_core/sink/sink_stream.h index a81fc3068..1e7658818 100755 --- a/src/audio_core/sink/sink_stream.h +++ b/src/audio_core/sink/sink_stream.h @@ -246,7 +246,7 @@ private: /// Maximum number of total samples that can be played since the last callback u64 max_played_sample_count{}; /// 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 f32 system_volume{1.0f}; /// Set via IAudioDevice service calls diff --git a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp index 352f31a32..2ab9d55c8 100755 --- a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp +++ b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp @@ -35,11 +35,11 @@ namespace { using namespace Common::Literals; u32 GetMemorySizeForInit() { - return Settings::values.use_extended_memory_layout ? Smc::MemorySize_6GB : Smc::MemorySize_4GB; + return Settings::values.use_extended_memory_layout ? Smc::MemorySize_8GB : Smc::MemorySize_4GB; } Smc::MemoryArrangement GetMemoryArrangeForInit() { - return Settings::values.use_extended_memory_layout ? Smc::MemoryArrangement_6GB + return Settings::values.use_extended_memory_layout ? Smc::MemoryArrangement_8GB : Smc::MemoryArrangement_4GB; } } // namespace diff --git a/src/yuzu/configuration/configure_general.ui b/src/yuzu/configuration/configure_general.ui index 5e7038f8c..e6a7ab758 100755 --- a/src/yuzu/configuration/configure_general.ui +++ b/src/yuzu/configuration/configure_general.ui @@ -64,7 +64,7 @@ - Extended memory layout (6GB DRAM) + Extended memory layout (8GB DRAM) diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index 37ea1b4e0..8f1fa6c9d 100755 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h @@ -163,7 +163,7 @@ keyboard_enabled = # 0: Disabled, 1 (default): Enabled use_multi_core = -# Enable extended guest system memory layout (6GB DRAM) +# Enable extended guest system memory layout (8GB DRAM) # 0 (default): Disabled, 1: Enabled use_extended_memory_layout =