ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AudioStream: Don't hold lock while resampling

This commit is contained in:
Connor McLaughlin 2021-01-13 19:25:15 +10:00
parent 2b5cfb272c
commit 1ae4b94eb2
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/audio_stream.cpp
View File

@ -156,12 +156,15 @@ void AudioStream::ReadFrames(SampleType* samples, u32 num_frames, bool apply_vol
const u32 total_samples = num_frames * m_channels; const u32 total_samples = num_frames * m_channels;
u32 samples_copied = 0; u32 samples_copied = 0;
{ {
std::unique_lock<std::mutex> lock(m_buffer_mutex); m_buffer_mutex.lock();
if (m_input_sample_rate == m_output_sample_rate) if (m_input_sample_rate == m_output_sample_rate)
{ {
samples_copied = std::min(m_buffer.GetSize(), total_samples); samples_copied = std::min(m_buffer.GetSize(), total_samples);
if (samples_copied > 0) if (samples_copied > 0)
m_buffer.PopRange(samples, samples_copied); m_buffer.PopRange(samples, samples_copied);
m_buffer_mutex.unlock();
m_buffer_draining_cv.notify_one();
} }
else else
{ {
@ -170,8 +173,6 @@ void AudioStream::ReadFrames(SampleType* samples, u32 num_frames, bool apply_vol
if (samples_copied > 0) if (samples_copied > 0)
m_resampled_buffer.PopRange(samples, samples_copied); m_resampled_buffer.PopRange(samples, samples_copied);
} }
m_buffer_draining_cv.notify_one();
} }
if (samples_copied < total_samples) if (samples_copied < total_samples)
@ -299,6 +300,9 @@ void AudioStream::ResampleInput()
} }
} }
m_buffer_mutex.unlock();
m_buffer_draining_cv.notify_one();
const u32 potential_output_size = const u32 potential_output_size =
(static_cast<u32>(m_resample_in_buffer.size()) * m_input_sample_rate) / m_output_sample_rate; (static_cast<u32>(m_resample_in_buffer.size()) * m_input_sample_rate) / m_output_sample_rate;
const u32 output_size = std::min(potential_output_size, m_resampled_buffer.GetSpace()); const u32 output_size = std::min(potential_output_size, m_resampled_buffer.GetSpace());