Update AudioSessionManager.mm

re-enabled Bluetooth Speaker and seamless audio handling

Signed-off-by: rohithzmoi <166651631+rohithzmoi@users.noreply.github.com>
This commit is contained in:
rohithzmoi 2024-09-14 05:02:48 +05:30 committed by GitHub
parent 608c1684c9
commit 0f3cae474a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 107 additions and 88 deletions

View File

@ -18,15 +18,17 @@
#import <AVFoundation/AVFoundation.h> #import <AVFoundation/AVFoundation.h>
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#include "droidstar.h" #include "droidstar.h"
// External C functions for calling process connect and clearing the audio buffer
extern "C" void callProcessConnect(); extern "C" void callProcessConnect();
extern "C" void clearAudioBuffer(); extern "C" void clearAudioBuffer();
@interface AudioSessionManager : NSObject { @interface AudioSessionManager : NSObject {
UIBackgroundTaskIdentifier _bgTask; // To manage background tasks UIBackgroundTaskIdentifier _bgTask;
BOOL isAudioSessionActive;
BOOL isHandlingRouteChange;
} }
- (void)setupAVAudioSession; - (void)setupAVAudioSession;
- (void)handleAudioInterruption:(NSNotification *)notification;
- (void)handleAudioRouteChange:(NSNotification *)notification;
- (void)setupBackgroundAudio; - (void)setupBackgroundAudio;
- (void)startBackgroundTask; - (void)startBackgroundTask;
- (void)stopBackgroundTask; - (void)stopBackgroundTask;
@ -34,6 +36,23 @@ extern "C" void clearAudioBuffer();
@implementation AudioSessionManager @implementation AudioSessionManager
- (instancetype)init {
self = [super init];
if (self) {
isAudioSessionActive = NO;
isHandlingRouteChange = NO;
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(handleAudioInterruption:)
name:AVAudioSessionInterruptionNotification
object:[AVAudioSession sharedInstance]];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(handleAudioRouteChange:)
name:AVAudioSessionRouteChangeNotification
object:[AVAudioSession sharedInstance]];
}
return self;
}
- (void)setupAVAudioSession { - (void)setupAVAudioSession {
@try { @try {
AVAudioSession *session = [AVAudioSession sharedInstance]; AVAudioSession *session = [AVAudioSession sharedInstance];
@ -41,12 +60,11 @@ extern "C" void clearAudioBuffer();
NSLog(@"Setting up AVAudioSession..."); NSLog(@"Setting up AVAudioSession...");
// Use category options suitable for VoIP or low-latency audio
BOOL success = [session setCategory:AVAudioSessionCategoryPlayAndRecord BOOL success = [session setCategory:AVAudioSessionCategoryPlayAndRecord
withOptions:AVAudioSessionCategoryOptionAllowBluetooth | withOptions:(AVAudioSessionCategoryOptionAllowBluetooth |
AVAudioSessionCategoryOptionMixWithOthers | AVAudioSessionCategoryOptionMixWithOthers |
AVAudioSessionCategoryOptionDefaultToSpeaker | AVAudioSessionCategoryOptionAllowBluetoothA2DP)
AVAudioSessionCategoryOptionAllowBluetoothA2DP
error:&error]; error:&error];
if (!success || error) { if (!success || error) {
@ -55,80 +73,25 @@ extern "C" void clearAudioBuffer();
} }
NSLog(@"AVAudioSession category set to PlayAndRecord with required options"); NSLog(@"AVAudioSession category set to PlayAndRecord with required options");
// Set mode to VoiceChat or VoIP to reduce latency
success = [session setMode:AVAudioSessionModeVoiceChat error:&error]; success = [session setMode:AVAudioSessionModeDefault error:&error];
if (!success || error) { if (!success || error) {
NSLog(@"Error setting AVAudioSession mode: %@, code: %ld", error.localizedDescription, (long)error.code); NSLog(@"Error setting AVAudioSession mode: %@, code: %ld", error.localizedDescription, (long)error.code);
return; return;
} }
NSLog(@"AVAudioSession mode set to VoiceChat"); NSLog(@"AVAudioSession mode set to Default");
// To Ensure audio is always routed to the speaker [self configureAudioRoute:session];
success = [session overrideOutputAudioPort:AVAudioSessionPortOverrideSpeaker error:&error]; if (!isAudioSessionActive) {
if (!success || error) {
NSLog(@"Error overriding audio output to speaker: %@, code: %ld", error.localizedDescription, (long)error.code);
} else {
NSLog(@"Audio output overridden to speaker");
}
// Activate session
success = [session setActive:YES error:&error]; success = [session setActive:YES error:&error];
if (!success || error) { if (!success || error) {
NSLog(@"Error activating AVAudioSession: %@, code: %ld", error.localizedDescription, (long)error.code); NSLog(@"Error activating AVAudioSession: %@, code: %ld", error.localizedDescription, (long)error.code);
return; return;
} }
isAudioSessionActive = YES;
NSLog(@"AVAudioSession activated successfully"); NSLog(@"AVAudioSession activated successfully");
}
// Handle audio interruptions
[[NSNotificationCenter defaultCenter] addObserverForName:AVAudioSessionInterruptionNotification
object:session
queue:[NSOperationQueue mainQueue]
usingBlock:^(NSNotification *note) {
NSUInteger interruptionType = [note.userInfo[AVAudioSessionInterruptionTypeKey] unsignedIntegerValue];
if (interruptionType == AVAudioSessionInterruptionTypeBegan) {
NSLog(@"Audio session interruption began");
} else if (interruptionType == AVAudioSessionInterruptionTypeEnded) {
NSLog(@"Audio session interruption ended, attempting to reactivate...");
[self setupAVAudioSession];
NSError *activationError = nil;
BOOL reactivationSuccess = [session setActive:YES error:&activationError];
if (!reactivationSuccess) {
NSLog(@"Error re-activating AVAudioSession after interruption: %@, code: %ld", activationError.localizedDescription, (long)activationError.code);
} else {
NSLog(@"Audio session successfully reactivated after interruption");
[session setCategory:AVAudioSessionCategoryPlayback
withOptions:AVAudioSessionCategoryOptionDefaultToSpeaker
error:nil];
[session overrideOutputAudioPort:AVAudioSessionPortOverrideSpeaker error:nil];
clearAudioBuffer(); // Clear the buffer to ensure current audio
}
}
}];
// Handle route changes (e.g., when Bluetooth or headphones are connected/disconnected)
[[NSNotificationCenter defaultCenter] addObserverForName:AVAudioSessionRouteChangeNotification
object:session
queue:[NSOperationQueue mainQueue]
usingBlock:^(NSNotification *note) {
AVAudioSessionRouteChangeReason reason = (AVAudioSessionRouteChangeReason)[note.userInfo[AVAudioSessionRouteChangeReasonKey] unsignedIntegerValue];
NSLog(@"Audio route changed, reason: %lu", (unsigned long)reason);
if (reason == AVAudioSessionRouteChangeReasonOldDeviceUnavailable ||
reason == AVAudioSessionRouteChangeReasonNewDeviceAvailable ||
reason == AVAudioSessionRouteChangeReasonOverride) {
NSLog(@"Audio route change detected, attempting to reactivate...");
[self setupAVAudioSession];
NSError *activationError = nil;
BOOL reactivationSuccess = [session setActive:YES error:&activationError];
if (!reactivationSuccess) {
NSLog(@"Error re-activating AVAudioSession after route change: %@, code: %ld", activationError.localizedDescription, (long)activationError.code);
} else {
NSLog(@"Audio session successfully reactivated after route change");
[session overrideOutputAudioPort:AVAudioSessionPortOverrideSpeaker error:nil];
}
}
}];
// Start background task to keep the app alive longer - Fingers Crossed :D
[self startBackgroundTask]; [self startBackgroundTask];
} }
@catch (NSException *exception) { @catch (NSException *exception) {
@ -136,6 +99,66 @@ extern "C" void clearAudioBuffer();
} }
} }
- (void)configureAudioRoute:(AVAudioSession *)session {
NSError *error = nil;
AVAudioSessionRouteDescription *currentRoute = session.currentRoute;
BOOL hasExternalOutput = NO;
for (AVAudioSessionPortDescription *output in currentRoute.outputs) {
if ([output.portType isEqualToString:AVAudioSessionPortBluetoothA2DP] ||
[output.portType isEqualToString:AVAudioSessionPortBluetoothLE] ||
[output.portType isEqualToString:AVAudioSessionPortBluetoothHFP] ||
[output.portType isEqualToString:AVAudioSessionPortHeadphones]) {
hasExternalOutput = YES;
break;
}
}
if (!hasExternalOutput) {
BOOL success = [session overrideOutputAudioPort:AVAudioSessionPortOverrideSpeaker error:&error];
if (!success || error) {
NSLog(@"Error overriding audio output to speaker: %@, code: %ld", error.localizedDescription, (long)error.code);
} else {
NSLog(@"Audio output overridden to speaker");
}
} else {
NSLog(@"External output detected, no need to override to speaker");
}
}
- (void)handleAudioInterruption:(NSNotification *)notification {
NSUInteger interruptionType = [notification.userInfo[AVAudioSessionInterruptionTypeKey] unsignedIntegerValue];
if (interruptionType == AVAudioSessionInterruptionTypeBegan) {
NSLog(@"Audio session interruption began");
isAudioSessionActive = NO;
} else if (interruptionType == AVAudioSessionInterruptionTypeEnded) {
NSLog(@"Audio session interruption ended, attempting to reactivate...");
[self setupAVAudioSession];
}
}
- (void)handleAudioRouteChange:(NSNotification *)notification {
if (isHandlingRouteChange) {
return;
}
isHandlingRouteChange = YES;
dispatch_async(dispatch_get_main_queue(), ^{
AVAudioSessionRouteChangeReason reason = (AVAudioSessionRouteChangeReason)[notification.userInfo[AVAudioSessionRouteChangeReasonKey] unsignedIntegerValue];
NSLog(@"Audio route changed, reason: %lu", (unsigned long)reason);
if (reason == AVAudioSessionRouteChangeReasonOldDeviceUnavailable ||
reason == AVAudioSessionRouteChangeReasonNewDeviceAvailable) {
NSLog(@"Audio route change detected, attempting to reactivate...");
[self setupAVAudioSession];
}
isHandlingRouteChange = NO;
});
}
- (void)setupBackgroundAudio { - (void)setupBackgroundAudio {
@try { @try {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
@ -144,14 +167,13 @@ extern "C" void clearAudioBuffer();
NSLog(@"Configuring AVAudioSession for background..."); NSLog(@"Configuring AVAudioSession for background...");
// Deactivate the session before setting the category
[session setActive:NO error:nil]; [session setActive:NO error:nil];
BOOL success = [session setCategory:AVAudioSessionCategoryPlayAndRecord BOOL success = [session setCategory:AVAudioSessionCategoryPlayAndRecord
withOptions:AVAudioSessionCategoryOptionDefaultToSpeaker | withOptions:(AVAudioSessionCategoryOptionDefaultToSpeaker |
AVAudioSessionCategoryOptionAllowBluetooth | AVAudioSessionCategoryOptionAllowBluetooth |
AVAudioSessionCategoryOptionAllowBluetoothA2DP | AVAudioSessionCategoryOptionAllowBluetoothA2DP |
AVAudioSessionCategoryOptionMixWithOthers AVAudioSessionCategoryOptionMixWithOthers)
error:&error]; error:&error];
if (!success || error) { if (!success || error) {
@ -166,9 +188,7 @@ extern "C" void clearAudioBuffer();
NSLog(@"AVAudioSession activated successfully in background"); NSLog(@"AVAudioSession activated successfully in background");
} }
} }
[self configureAudioRoute:session];
// Ensure the audio output is overridden to speake, else audio may at times play through earpiece or volume will be very less
[session overrideOutputAudioPort:AVAudioSessionPortOverrideSpeaker error:nil];
}); });
} }
@catch (NSException *exception) { @catch (NSException *exception) {
@ -192,7 +212,7 @@ extern "C" void clearAudioBuffer();
@end @end
// Expose the setup and management functions to C
extern "C" void setupAVAudioSession() { extern "C" void setupAVAudioSession() {
AudioSessionManager *audioManager = [[AudioSessionManager alloc] init]; AudioSessionManager *audioManager = [[AudioSessionManager alloc] init];
[audioManager setupAVAudioSession]; [audioManager setupAVAudioSession];
@ -218,19 +238,18 @@ extern "C" void deactivateAVAudioSession() {
} }
} }
// Handle app entering background
extern "C" void setupBackgroundAudio() { extern "C" void setupBackgroundAudio() {
AudioSessionManager *audioManager = [[AudioSessionManager alloc] init]; AudioSessionManager *audioManager = [[AudioSessionManager alloc] init];
[audioManager setupBackgroundAudio]; [audioManager setupBackgroundAudio];
} }
// Handle app entering foreground
extern "C" void handleAppEnteringForeground() { extern "C" void handleAppEnteringForeground() {
AudioSessionManager *audioManager = [[AudioSessionManager alloc] init]; AudioSessionManager *audioManager = [[AudioSessionManager alloc] init];
[audioManager setupAVAudioSession]; [audioManager setupAVAudioSession];
} }
// function to clear the audio buffer
extern "C" void clearAudioBuffer() { extern "C" void clearAudioBuffer() {
NSLog(@"Clearing audio buffer to ensure current audio playback"); NSLog(@"Clearing audio buffer to ensure current audio playback");
} }