diff options
author | bunnei <bunneidev@gmail.com> | 2018-08-12 22:22:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-12 22:22:11 +0200 |
commit | e12a07079e217bd389f117876a4cb3359cdee333 (patch) | |
tree | 906352166eab9b2b428e7df39b66f77f57b22346 /src/audio_core | |
parent | Merge pull request #1035 from ogniK5377/audio-dev-revision-info (diff) | |
parent | cubeb_sink: Protect queue with a mutex (diff) | |
download | yuzu-e12a07079e217bd389f117876a4cb3359cdee333.tar yuzu-e12a07079e217bd389f117876a4cb3359cdee333.tar.gz yuzu-e12a07079e217bd389f117876a4cb3359cdee333.tar.bz2 yuzu-e12a07079e217bd389f117876a4cb3359cdee333.tar.lz yuzu-e12a07079e217bd389f117876a4cb3359cdee333.tar.xz yuzu-e12a07079e217bd389f117876a4cb3359cdee333.tar.zst yuzu-e12a07079e217bd389f117876a4cb3359cdee333.zip |
Diffstat (limited to 'src/audio_core')
-rw-r--r-- | src/audio_core/cubeb_sink.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/audio_core/cubeb_sink.cpp b/src/audio_core/cubeb_sink.cpp index 1501ef1f4..5a1177d0c 100644 --- a/src/audio_core/cubeb_sink.cpp +++ b/src/audio_core/cubeb_sink.cpp @@ -4,6 +4,7 @@ #include <algorithm> #include <cstring> +#include <mutex> #include "audio_core/cubeb_sink.h" #include "audio_core/stream.h" @@ -66,6 +67,8 @@ public: return; } + std::lock_guard lock{queue_mutex}; + queue.reserve(queue.size() + samples.size() * GetNumChannels()); if (is_6_channel) { @@ -94,6 +97,7 @@ private: u32 num_channels{}; bool is_6_channel{}; + std::mutex queue_mutex; std::vector<s16> queue; 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 {}; } + std::lock_guard lock{impl->queue_mutex}; + const size_t frames_to_write{ std::min(impl->queue.size() / impl->GetNumChannels(), static_cast<size_t>(num_frames))}; |