diff --git a/android/build.gradle b/android/build.gradle index ddddd2246..9c5e6c3ea 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -31,6 +31,6 @@ android { dependencies { implementation "com.facebook.react:react-android:+" - api 'io.github.webrtc-sdk:android:125.6422.04' + api 'io.github.webrtc-sdk:android:137.7151.01' implementation "androidx.core:core:1.7.0" } diff --git a/android/src/main/java/com/oney/WebRTCModule/RTCFrameCryptor.java b/android/src/main/java/com/oney/WebRTCModule/RTCFrameCryptor.java index 74c1f019d..9293e2eb9 100644 --- a/android/src/main/java/com/oney/WebRTCModule/RTCFrameCryptor.java +++ b/android/src/main/java/com/oney/WebRTCModule/RTCFrameCryptor.java @@ -83,8 +83,8 @@ private FrameCryptorAlgorithm frameCryptorAlgorithmFromInt(int algorithm) { switch (algorithm) { case 0: return FrameCryptorAlgorithm.AES_GCM; - case 1: - return FrameCryptorAlgorithm.AES_CBC; + // case 1: + // return FrameCryptorAlgorithm.AES_CBC; default: return FrameCryptorAlgorithm.AES_GCM; } diff --git a/ios/RCTWebRTC/WebRTCModule+RTCFrameCryptor.m b/ios/RCTWebRTC/WebRTCModule+RTCFrameCryptor.m index ad4156aba..befb031ff 100644 --- a/ios/RCTWebRTC/WebRTCModule+RTCFrameCryptor.m +++ b/ios/RCTWebRTC/WebRTCModule+RTCFrameCryptor.m @@ -460,21 +460,21 @@ - (nullable RTCFrameCryptorKeyProvider *)getKeyProviderForId:(NSString *)keyProv resolve(@{@"result" : @"success"}); } -- (NSString *)stringFromState:(FrameCryptionState)state { +- (NSString *)stringFromState:(RTCFrameCryptorState)state { switch (state) { - case FrameCryptionStateNew: + case RTCFrameCryptorStateNew: return @"new"; - case FrameCryptionStateOk: + case RTCFrameCryptorStateOk: return @"ok"; - case FrameCryptionStateEncryptionFailed: + case RTCFrameCryptorStateEncryptionFailed: return @"encryptionFailed"; - case FrameCryptionStateDecryptionFailed: + case RTCFrameCryptorStateDecryptionFailed: return @"decryptionFailed"; - case FrameCryptionStateMissingKey: + case RTCFrameCryptorStateMissingKey: return @"missingKey"; - case FrameCryptionStateKeyRatcheted: + case RTCFrameCryptorStateKeyRatcheted: return @"keyRatcheted"; - case FrameCryptionStateInternalError: + case RTCFrameCryptorStateInternalError: return @"internalError"; default: return @"unknown"; @@ -485,7 +485,7 @@ - (NSString *)stringFromState:(FrameCryptionState)state { - (void)frameCryptor:(RTC_OBJC_TYPE(RTCFrameCryptor) *)frameCryptor didStateChangeWithParticipantId:(NSString *)participantId - withState:(FrameCryptionState)stateChanged { + withState:(RTCFrameCryptorState)stateChanged { id frameCryptorId = objc_getAssociatedObject(frameCryptor, &frameCryptorUUIDKey); if (![frameCryptorId isKindOfClass:[NSString class]]) { diff --git a/ios/RCTWebRTC/WebRTCModule.m b/ios/RCTWebRTC/WebRTCModule.m index c22263035..27fa77fd0 100644 --- a/ios/RCTWebRTC/WebRTCModule.m +++ b/ios/RCTWebRTC/WebRTCModule.m @@ -77,7 +77,8 @@ - (instancetype)init { } RCTLogInfo(@"Using audio processing module: %@", NSStringFromClass([audioProcessingModule class])); _peerConnectionFactory = - [[RTCPeerConnectionFactory alloc] initWithBypassVoiceProcessing:NO + [[RTCPeerConnectionFactory alloc] initWithAudioDeviceModuleType:RTCAudioDeviceModuleTypeAudioEngine + bypassVoiceProcessing:NO encoderFactory:encoderFactory decoderFactory:decoderFactory audioProcessingModule:audioProcessingModule]; diff --git a/livekit-react-native-webrtc.podspec b/livekit-react-native-webrtc.podspec index 060b1640e..0f05889ae 100644 --- a/livekit-react-native-webrtc.podspec +++ b/livekit-react-native-webrtc.podspec @@ -19,7 +19,7 @@ Pod::Spec.new do |s| s.libraries = 'c', 'sqlite3', 'stdc++' s.framework = 'AudioToolbox','AVFoundation', 'CoreAudio', 'CoreGraphics', 'CoreVideo', 'GLKit', 'VideoToolbox' s.dependency 'React-Core' - s.dependency 'WebRTC-SDK', '=125.6422.07' + s.dependency 'WebRTC-SDK', '=137.7151.02' # Swift/Objective-C compatibility s.pod_target_xcconfig = {