early-access version 3503
This commit is contained in:
parent
74f017f7f3
commit
b724afb142
6 changed files with 8 additions and 9 deletions
|
@ -1,7 +1,7 @@
|
||||||
yuzu emulator early access
|
yuzu emulator early access
|
||||||
=============
|
=============
|
||||||
|
|
||||||
This is the source code for early-access 3502.
|
This is the source code for early-access 3503.
|
||||||
|
|
||||||
## Legal Notice
|
## Legal Notice
|
||||||
|
|
||||||
|
|
|
@ -252,8 +252,7 @@ void SinkStream::ProcessAudioOutAndRender(std::span<s16> output_buffer, std::siz
|
||||||
|
|
||||||
{
|
{
|
||||||
std::scoped_lock lk{sample_count_lock};
|
std::scoped_lock lk{sample_count_lock};
|
||||||
last_sample_count_update_time =
|
last_sample_count_update_time = system.CoreTiming().GetGlobalTimeNs();
|
||||||
Core::Timing::CyclesToUs(system.CoreTiming().GetClockTicks());
|
|
||||||
min_played_sample_count = max_played_sample_count;
|
min_played_sample_count = max_played_sample_count;
|
||||||
max_played_sample_count += actual_frames_written;
|
max_played_sample_count += actual_frames_written;
|
||||||
}
|
}
|
||||||
|
@ -261,7 +260,7 @@ void SinkStream::ProcessAudioOutAndRender(std::span<s16> output_buffer, std::siz
|
||||||
|
|
||||||
u64 SinkStream::GetExpectedPlayedSampleCount() {
|
u64 SinkStream::GetExpectedPlayedSampleCount() {
|
||||||
std::scoped_lock lk{sample_count_lock};
|
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 time_delta{cur_time - last_sample_count_update_time};
|
||||||
auto exp_played_sample_count{min_played_sample_count +
|
auto exp_played_sample_count{min_played_sample_count +
|
||||||
(TargetSampleRate * time_delta) / std::chrono::seconds{1}};
|
(TargetSampleRate * time_delta) / std::chrono::seconds{1}};
|
||||||
|
|
|
@ -246,7 +246,7 @@ private:
|
||||||
/// Maximum number of total samples that can be played since the last callback
|
/// Maximum number of total samples that can be played since the last callback
|
||||||
u64 max_played_sample_count{};
|
u64 max_played_sample_count{};
|
||||||
/// The time the two above tracking variables were last written to
|
/// 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
|
/// Set by the audio render/in/out system which uses this stream
|
||||||
f32 system_volume{1.0f};
|
f32 system_volume{1.0f};
|
||||||
/// Set via IAudioDevice service calls
|
/// Set via IAudioDevice service calls
|
||||||
|
|
|
@ -35,11 +35,11 @@ namespace {
|
||||||
using namespace Common::Literals;
|
using namespace Common::Literals;
|
||||||
|
|
||||||
u32 GetMemorySizeForInit() {
|
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() {
|
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;
|
: Smc::MemoryArrangement_4GB;
|
||||||
}
|
}
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
|
@ -64,7 +64,7 @@
|
||||||
<item>
|
<item>
|
||||||
<widget class="QCheckBox" name="use_extended_memory_layout">
|
<widget class="QCheckBox" name="use_extended_memory_layout">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Extended memory layout (6GB DRAM)</string>
|
<string>Extended memory layout (8GB DRAM)</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|
|
@ -163,7 +163,7 @@ keyboard_enabled =
|
||||||
# 0: Disabled, 1 (default): Enabled
|
# 0: Disabled, 1 (default): Enabled
|
||||||
use_multi_core =
|
use_multi_core =
|
||||||
|
|
||||||
# Enable extended guest system memory layout (6GB DRAM)
|
# Enable extended guest system memory layout (8GB DRAM)
|
||||||
# 0 (default): Disabled, 1: Enabled
|
# 0 (default): Disabled, 1: Enabled
|
||||||
use_extended_memory_layout =
|
use_extended_memory_layout =
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue