Skip to content
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.

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

fix: fix useIosAudioManagement not getting mic/audio when going from playback to playAndRecord #168

Merged
merged 1 commit into from
Aug 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions example/src/RoomPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {
type TrackReferenceOrPlaceholder,
type ReceivedDataMessage,
AndroidAudioTypePresets,
useIOSAudioManagement,
} from '@livekit/react-native';
import { Platform } from 'react-native';
// @ts-ignore
Expand Down Expand Up @@ -89,6 +90,7 @@ const RoomView = ({ navigation }: RoomViewProps) => {
const [isCameraFrontFacing, setCameraFrontFacing] = useState(true);
const room = useRoomContext();

useIOSAudioManagement(room, true);
// Setup room listeners
const { send } = useDataChannel(
(dataMessage: ReceivedDataMessage<string>) => {
Expand Down
85 changes: 50 additions & 35 deletions ios/LivekitReactNative.m
Original file line number Diff line number Diff line change
Expand Up @@ -121,44 +121,59 @@ +(void)setup {

/// Configure audio config for WebRTC
RCT_EXPORT_METHOD(setAppleAudioConfiguration:(NSDictionary *) configuration){
RTCAudioSession* session = [RTCAudioSession sharedInstance];
RTCAudioSessionConfiguration* config = [RTCAudioSessionConfiguration webRTCConfiguration];

NSString* appleAudioCategory = configuration[@"audioCategory"];
NSArray* appleAudioCategoryOptions = configuration[@"audioCategoryOptions"];
NSString* appleAudioMode = configuration[@"audioMode"];

[session lockForConfiguration];

if(appleAudioCategoryOptions != nil) {
config.categoryOptions = 0;
for(NSString* option in appleAudioCategoryOptions) {
if([@"mixWithOthers" isEqualToString:option]) {
config.categoryOptions |= AVAudioSessionCategoryOptionMixWithOthers;
} else if([@"duckOthers" isEqualToString:option]) {
config.categoryOptions |= AVAudioSessionCategoryOptionDuckOthers;
} else if([@"allowBluetooth" isEqualToString:option]) {
config.categoryOptions |= AVAudioSessionCategoryOptionAllowBluetooth;
} else if([@"allowBluetoothA2DP" isEqualToString:option]) {
config.categoryOptions |= AVAudioSessionCategoryOptionAllowBluetoothA2DP;
} else if([@"allowAirPlay" isEqualToString:option]) {
config.categoryOptions |= AVAudioSessionCategoryOptionAllowAirPlay;
} else if([@"defaultToSpeaker" isEqualToString:option]) {
config.categoryOptions |= AVAudioSessionCategoryOptionDefaultToSpeaker;
}
RTCAudioSession* session = [RTCAudioSession sharedInstance];
RTCAudioSessionConfiguration* config = [RTCAudioSessionConfiguration webRTCConfiguration];

NSString* appleAudioCategory = configuration[@"audioCategory"];
NSArray* appleAudioCategoryOptions = configuration[@"audioCategoryOptions"];
NSString* appleAudioMode = configuration[@"audioMode"];

[session lockForConfiguration];

NSError* error = nil;
BOOL categoryChanged = NO;
if(appleAudioCategoryOptions != nil) {
categoryChanged = YES;
config.categoryOptions = 0;
for(NSString* option in appleAudioCategoryOptions) {
if([@"mixWithOthers" isEqualToString:option]) {
config.categoryOptions |= AVAudioSessionCategoryOptionMixWithOthers;
} else if([@"duckOthers" isEqualToString:option]) {
config.categoryOptions |= AVAudioSessionCategoryOptionDuckOthers;
} else if([@"allowBluetooth" isEqualToString:option]) {
config.categoryOptions |= AVAudioSessionCategoryOptionAllowBluetooth;
} else if([@"allowBluetoothA2DP" isEqualToString:option]) {
config.categoryOptions |= AVAudioSessionCategoryOptionAllowBluetoothA2DP;
} else if([@"allowAirPlay" isEqualToString:option]) {
config.categoryOptions |= AVAudioSessionCategoryOptionAllowAirPlay;
} else if([@"defaultToSpeaker" isEqualToString:option]) {
config.categoryOptions |= AVAudioSessionCategoryOptionDefaultToSpeaker;
}
}
}
}

if(appleAudioCategory != nil) {
config.category = [AudioUtils audioSessionCategoryFromString:appleAudioCategory];
[session setCategory:config.category withOptions:config.categoryOptions error:nil];
}
if(appleAudioCategory != nil) {
categoryChanged = YES;
config.category = [AudioUtils audioSessionCategoryFromString:appleAudioCategory];
}

if(categoryChanged) {
[session setCategory:config.category withOptions:config.categoryOptions error:&error];
if(error != nil) {
NSLog(@"Error setting category: %@", [error localizedDescription]);
error = nil;
}
}

if(appleAudioMode != nil) {
config.mode = [AudioUtils audioSessionModeFromString:appleAudioMode];
[session setMode:config.mode error:nil];
}
if(appleAudioMode != nil) {
config.mode = [AudioUtils audioSessionModeFromString:appleAudioMode];
[session setMode:config.mode error:&error];
if(error != nil) {
NSLog(@"Error setting category: %@", [error localizedDescription]);
error = nil;
}
}

[session unlockForConfiguration];
[session unlockForConfiguration];
}
@end
6 changes: 6 additions & 0 deletions src/audio/AudioSession.ts
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,12 @@ export default class AudioSession {
}
};

/**
* Directly change the AVAudioSession category/mode.
*
* @param config The configuration to use. Null values will be omitted and the
* existing values will be unchanged.
*/
static setAppleAudioConfiguration = async (
config: AppleAudioConfiguration
) => {
Expand Down
24 changes: 23 additions & 1 deletion src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import AudioSession, {
} from './audio/AudioSession';
import type { AudioConfiguration } from './audio/AudioSession';
import { PixelRatio, Platform } from 'react-native';
import type { LiveKitReactNativeInfo } from 'livekit-client';
import { type LiveKitReactNativeInfo } from 'livekit-client';
import type { LogLevel, SetLogLevelOptions } from './logger';

/**
Expand All @@ -23,6 +23,7 @@ import type { LogLevel, SetLogLevelOptions } from './logger';
*/
export function registerGlobals() {
webrtcRegisterGlobals();
iosCategoryEnforce();
livekitRegisterGlobals();
setupURLPolyfill();
fixWebrtcAdapter();
Expand All @@ -31,6 +32,27 @@ export function registerGlobals() {
shimAsyncIterator();
shimIterator();
}

/**
* Enforces changing to playAndRecord category prior to obtaining microphone.
*/
function iosCategoryEnforce() {
if (Platform.OS === 'ios') {
// @ts-ignore
let getUserMediaFunc = global.navigator.mediaDevices.getUserMedia;
// @ts-ignore
global.navigator.mediaDevices.getUserMedia = async (constraints: any) => {
if (constraints.audio) {
await AudioSession.setAppleAudioConfiguration({
audioCategory: 'playAndRecord',
});
}

return await getUserMediaFunc(constraints);
};
}
}

function livekitRegisterGlobals() {
let lkGlobal: LiveKitReactNativeInfo = {
platform: Platform.OS,
Expand Down
Loading