Skip to content

Commit 367d95f

Browse files
committed
Fix FrameCryptor deadlock
1 parent bf2129a commit 367d95f

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

Sources/LiveKit/E2EE/E2EEManager.swift

+12-14
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,12 @@ public class E2EEManager: NSObject, ObservableObject, Loggable {
113113
return
114114
}
115115

116-
guard let frameCryptor = DispatchQueue.liveKitWebRTC.sync(execute: {
117-
LKRTCFrameCryptor(factory: RTC.peerConnectionFactory,
118-
rtpSender: sender,
119-
participantId: participantIdentity.stringValue,
120-
algorithm: .aesGcm,
121-
keyProvider: e2eeOptions.keyProvider.rtcKeyProvider)
122-
}) else {
116+
guard let frameCryptor = LKRTCFrameCryptor(factory: RTC.peerConnectionFactory,
117+
rtpSender: sender,
118+
participantId: participantIdentity.stringValue,
119+
algorithm: .aesGcm,
120+
keyProvider: e2eeOptions.keyProvider.rtcKeyProvider)
121+
else {
123122
log("frameCryptor is nil, skipping creating frame cryptor...", .warning)
124123
return
125124
}
@@ -144,13 +143,12 @@ public class E2EEManager: NSObject, ObservableObject, Loggable {
144143
return
145144
}
146145

147-
guard let frameCryptor = DispatchQueue.liveKitWebRTC.sync(execute: {
148-
LKRTCFrameCryptor(factory: RTC.peerConnectionFactory,
149-
rtpReceiver: receiver,
150-
participantId: participantIdentity.stringValue,
151-
algorithm: .aesGcm,
152-
keyProvider: e2eeOptions.keyProvider.rtcKeyProvider)
153-
}) else {
146+
guard let frameCryptor = LKRTCFrameCryptor(factory: RTC.peerConnectionFactory,
147+
rtpReceiver: receiver,
148+
participantId: participantIdentity.stringValue,
149+
algorithm: .aesGcm,
150+
keyProvider: e2eeOptions.keyProvider.rtcKeyProvider)
151+
else {
154152
log("frameCryptor is nil, skipping creating frame cryptor...", .warning)
155153
return
156154
}

0 commit comments

Comments
 (0)