octo
/
yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable time stretcher for time being

This commit is contained in:
David Marcec 2020-07-12 22:13:48 +10:00
parent 380658c21d
commit d68856ab12
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/audio_core/cubeb_sink.cpp
View File

@ -203,6 +203,7 @@ long CubebSinkStream::DataCallback(cubeb_stream* stream, void* user_data, const
const std::size_t samples_to_write = num_channels * num_frames; const std::size_t samples_to_write = num_channels * num_frames;
std::size_t samples_written; std::size_t samples_written;
/*
if (Settings::values.enable_audio_stretching.GetValue()) { if (Settings::values.enable_audio_stretching.GetValue()) {
const std::vector<s16> in{impl->queue.Pop()}; const std::vector<s16> in{impl->queue.Pop()};
const std::size_t num_in{in.size() / num_channels}; const std::size_t num_in{in.size() / num_channels};
@ -217,7 +218,8 @@ long CubebSinkStream::DataCallback(cubeb_stream* stream, void* user_data, const
} }
} else { } else {
samples_written = impl->queue.Pop(buffer, samples_to_write); samples_written = impl->queue.Pop(buffer, samples_to_write);
} }*/
samples_written = impl->queue.Pop(buffer, samples_to_write);
if (samples_written >= num_channels) { if (samples_written >= num_channels) {
std::memcpy(&impl->last_frame[0], buffer + (samples_written - num_channels) * sizeof(s16), std::memcpy(&impl->last_frame[0], buffer + (samples_written - num_channels) * sizeof(s16),

6
src/audio_core/stream.cpp
View File

@ -103,11 +103,7 @@ void Stream::PlayNextBuffer(std::chrono::nanoseconds ns_late) {
sink_stream.EnqueueSamples(GetNumChannels(), active_buffer->GetSamples()); sink_stream.EnqueueSamples(GetNumChannels(), active_buffer->GetSamples());
const auto time_stretch_delta = Settings::values.enable_audio_stretching.GetValue() core_timing.ScheduleEvent(GetBufferReleaseNS(*active_buffer) - ns_late, release_event, {});
? std::chrono::nanoseconds::zero()
: ns_late;
const auto future_time = GetBufferReleaseNS(*active_buffer) - time_stretch_delta;
core_timing.ScheduleEvent(future_time, release_event, {});
} }
void Stream::ReleaseActiveBuffer(std::chrono::nanoseconds ns_late) { void Stream::ReleaseActiveBuffer(std::chrono::nanoseconds ns_late) {