Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-01-19 14:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AudioStream: Prevent writing too many frames at once and hanging

Browse source
This commit is contained in:
Connor McLaughlin 2021-01-31 15:31:02 +10:00
parent ef7d135492
commit 35f8ea13d9
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/common/audio_stream.cpp
View file

@ -111,7 +111,8 @@ void AudioStream::BeginWrite(SampleType** buffer_ptr, u32* num_frames)
{ {
m_buffer_mutex.lock(); m_buffer_mutex.lock();
EnsureBuffer(*num_frames * m_channels); const u32 requested_frames = std::min(*num_frames, m_buffer_size);
EnsureBuffer(requested_frames * m_channels);
*buffer_ptr = m_buffer.GetWritePointer(); *buffer_ptr = m_buffer.GetWritePointer();
*num_frames = m_buffer.GetContiguousSpace() / m_channels; *num_frames = m_buffer.GetContiguousSpace() / m_channels;
@ -119,6 +120,7 @@ void AudioStream::BeginWrite(SampleType** buffer_ptr, u32* num_frames)
void AudioStream::WriteFrames(const SampleType* frames, u32 num_frames) void AudioStream::WriteFrames(const SampleType* frames, u32 num_frames)
{ {
Assert(num_frames <= m_buffer_size);
const u32 num_samples = num_frames * m_channels; const u32 num_samples = num_frames * m_channels;
{ {
std::unique_lock<std::mutex> lock(m_buffer_mutex); std::unique_lock<std::mutex> lock(m_buffer_mutex);
@ -261,6 +263,7 @@ void AudioStream::ReadFrames(SampleType* samples, u32 num_frames, bool apply_vol
void AudioStream::EnsureBuffer(u32 size) void AudioStream::EnsureBuffer(u32 size)
{ {
DebugAssert(size <= m_buffer_size);
if (GetBufferSpace() >= size) if (GetBufferSpace() >= size)
return; return;