yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Merge pull request #1038 from MerryMage/lock-cubeb 

cubeb_sink: Protect queue with a mutex
This commit is contained in:
bunnei 2018-08-12 16:22:11 -04:00 committed by GitHub
parent 4cafc24a4e fcc5ffdfdd
commit e12a07079e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/audio_core/cubeb_sink.cpp
View File

@ -4,6 +4,7 @@
#include <algorithm> #include <algorithm>
#include <cstring> #include <cstring>
#include <mutex>
#include "audio_core/cubeb_sink.h" #include "audio_core/cubeb_sink.h"
#include "audio_core/stream.h" #include "audio_core/stream.h"
@ -66,6 +67,8 @@ public:
return; return;
} }
std::lock_guard lock{queue_mutex};
queue.reserve(queue.size() + samples.size() * GetNumChannels()); queue.reserve(queue.size() + samples.size() * GetNumChannels());
if (is_6_channel) { if (is_6_channel) {
@ -94,6 +97,7 @@ private:
u32 num_channels{}; u32 num_channels{};
bool is_6_channel{}; bool is_6_channel{};
std::mutex queue_mutex;
std::vector<s16> queue; std::vector<s16> queue;
static long DataCallback(cubeb_stream* stream, void* user_data, const void* input_buffer, static long DataCallback(cubeb_stream* stream, void* user_data, const void* input_buffer,
@ -153,6 +157,8 @@ long SinkStreamImpl::DataCallback(cubeb_stream* stream, void* user_data, const v
return {}; return {};
} }
std::lock_guard lock{impl->queue_mutex};
const size_t frames_to_write{ const size_t frames_to_write{
std::min(impl->queue.size() / impl->GetNumChannels(), static_cast<size_t>(num_frames))}; std::min(impl->queue.size() / impl->GetNumChannels(), static_cast<size_t>(num_frames))};