mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-11-15 08:12:23 +00:00
Fix PTT playback deadlock on engine stop
The buffer completion callback read `engine.isRunning` on the AVAudioPlayerNode completion queue. `AVAudioPlayerNode.stop()` holds the engine lock while it waits synchronously for that queue, so a main-thread stop (category-escalation rebuild, teardown) deadlocked and the watchdog killed the app (0x8BADF00D). Seen on device when opening the video camera while a live stream's audio was playing. Classify completions on a private serial queue instead, so the node's completion queue never touches the engine. (cherry picked from commit bf1e1e70b290e4c7701002e69a5dbe49349f8b82)
This commit is contained in:
parent
04995f68e4
commit
ae97cfc494
@ -85,26 +85,35 @@ private final class SystemPTTPlaybackEngine: PTTPlaybackEngine {
|
||||
}
|
||||
let scheduledEngine = engine
|
||||
node.scheduleBuffer(buffer, completionCallbackType: callbackType) { [weak scheduledEngine] callbackType in
|
||||
// The API invokes this callback when the player is stopped as
|
||||
// well. A configuration change can stop the engine before its
|
||||
// notification reaches MainActor, so do not misclassify that
|
||||
// flushed tail as audible playback.
|
||||
guard scheduledEngine?.isRunning == true else {
|
||||
completionHandler(.playbackStopped)
|
||||
return
|
||||
}
|
||||
switch callbackType {
|
||||
case .dataConsumed:
|
||||
completionHandler(.dataConsumed)
|
||||
case .dataRendered:
|
||||
completionHandler(.dataConsumed)
|
||||
case .dataPlayedBack:
|
||||
completionHandler(.dataPlayedBack)
|
||||
@unknown default:
|
||||
completionHandler(.playbackStopped)
|
||||
// Never touch the engine on the node's completion queue:
|
||||
// `AVAudioPlayerNode.stop()` holds the engine lock while it waits
|
||||
// synchronously for that queue, so `isRunning` here deadlocks a
|
||||
// main-thread stop (category-escalation rebuild, teardown).
|
||||
Self.completionClassifier.async {
|
||||
// The API invokes this callback when the player is stopped as
|
||||
// well. A configuration change can stop the engine before its
|
||||
// notification reaches MainActor, so do not misclassify that
|
||||
// flushed tail as audible playback.
|
||||
guard scheduledEngine?.isRunning == true else {
|
||||
completionHandler(.playbackStopped)
|
||||
return
|
||||
}
|
||||
switch callbackType {
|
||||
case .dataConsumed:
|
||||
completionHandler(.dataConsumed)
|
||||
case .dataRendered:
|
||||
completionHandler(.dataConsumed)
|
||||
case .dataPlayedBack:
|
||||
completionHandler(.dataPlayedBack)
|
||||
@unknown default:
|
||||
completionHandler(.playbackStopped)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Serial so completions keep their scheduling order.
|
||||
nonisolated private static let completionClassifier = DispatchQueue(label: "chat.bitchat.ptt.playback-completion")
|
||||
}
|
||||
|
||||
/// Completion callbacks arrive off the main actor, while engine rebuilds are
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user