Skip to content

fix(ios): reuse AVAudioEngine instance in rebuildAudioEngine to prevent owningEngine assertion crash #1014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
radko93 wants to merge 1 commit into
base: main
Choose a base branch
from
+30 −14
Open

fix(ios): reuse AVAudioEngine instance in rebuildAudioEngine to prevent owningEngine assertion crash #1014

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 30 additions & 14 deletions packages/react-native-audio-api/ios/audioapi/ios/system/AudioEngine.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,8 @@ - (void)onInterruptionEnd:(bool)shouldResume
return;
}

// Stop just in case, reset the engine and build it from scratch
// Stop just in case and rebuild graph connections.
[self stopIfNecessary];
[self.audioEngine reset];
[self rebuildAudioEngine];

// If shouldResume is false, mark the engine as paused and wait
Expand Down Expand Up @@ -140,33 +139,51 @@ - (AudioEngineState)getState
return self.state;
}

/// @brief Rebuilds the audio engine by re-attaching and re-connecting all source nodes and input node.
/// @brief Rebuilds audio graph connections on the current engine instance.
- (void)rebuildAudioEngine
{
if (self.audioEngine != nil) {
for (id sourceNodeId in self.sourceNodes) {
AVAudioSourceNode *sourceNode = [self.sourceNodes valueForKey:sourceNodeId];
BOOL createdFreshEngine = NO;
if (self.audioEngine == nil) {
self.audioEngine = [[AVAudioEngine alloc] init];
createdFreshEngine = YES;
}

[self.audioEngine detachNode:sourceNode];
}
if ([self.audioEngine isRunning]) {
[self.audioEngine stop];
}

if (self.inputNode) {
[self.audioEngine detachNode:self.inputNode];
[self.audioEngine reset];

// Keep nodes attached to the same engine instance and only rebuild
// connections. This avoids reusing nodes across engine instances.
for (id sourceNodeId in self.sourceNodes) {
AVAudioSourceNode *sourceNode = [self.sourceNodes valueForKey:sourceNodeId];
if (createdFreshEngine) {
[self.audioEngine attachNode:sourceNode];
} else {
[self.audioEngine disconnectNodeInput:sourceNode];
[self.audioEngine disconnectNodeOutput:sourceNode];
}
}

self.audioEngine = [[AVAudioEngine alloc] init];
if (self.inputNode) {
if (createdFreshEngine) {
[self.audioEngine attachNode:self.inputNode];
} else {
[self.audioEngine disconnectNodeInput:self.inputNode];
[self.audioEngine disconnectNodeOutput:self.inputNode];
[self.audioEngine disconnectNodeOutput:self.audioEngine.inputNode];
}
}

for (id sourceNodeId in self.sourceNodes) {
AVAudioSourceNode *sourceNode = [self.sourceNodes valueForKey:sourceNodeId];
AVAudioFormat *format = [self.sourceFormats valueForKey:sourceNodeId];

[self.audioEngine attachNode:sourceNode];
[self.audioEngine connect:sourceNode to:self.audioEngine.mainMixerNode format:format];
}

if (self.inputNode) {
[self.audioEngine attachNode:self.inputNode];
[self.audioEngine connect:self.audioEngine.inputNode to:self.inputNode format:nil];
}
}
Expand All @@ -188,7 +205,6 @@ - (bool)startEngine

if (self.state == AudioEngineState::AudioEngineStateInterrupted) {
[self.audioEngine stop];
[self.audioEngine reset];
[self rebuildAudioEngine];
}

Expand Down