mirror of
https://git.h3cjp.net/H3cJP/yuzu.git
synced 2024-12-27 05:26:47 +00:00
android: audio_core: Avoid shutdown hang.
This commit is contained in:
parent
9ca8687b5f
commit
40e938376b
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue