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

android: audio_core: Avoid shutdown hang.

Browse Source
This commit is contained in:
bunnei
2023-05-31 18:21:10 -07:00
parent 9ca8687b5f
commit 40e938376b
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/audio_core/sink/sink_stream.cpp
View File

@@ -273,9 +273,12 @@ void SinkStream::WaitFreeSpace() {
std::unique_lock lk{release_mutex}; std::unique_lock lk{release_mutex};
release_cv.wait_for(lk, std::chrono::milliseconds(5), release_cv.wait_for(lk, std::chrono::milliseconds(5),
[this]() { return queued_buffers < max_queue_size; }); [this]() { return queued_buffers < max_queue_size; });
#ifndef ANDROID
// This wait can cause a problematic shutdown hang on Android.
if (queued_buffers > max_queue_size + 3) { if (queued_buffers > max_queue_size + 3) {
release_cv.wait(lk, [this]() { return queued_buffers < max_queue_size; }); release_cv.wait(lk, [this]() { return queued_buffers < max_queue_size; });
} }
#endif
} }
} // namespace AudioCore::Sink } // namespace AudioCore::Sink