keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'charlesmchen/peerConnectionClientDelegateCleanup'

Browse Source
pull/1/head
Matthew Chen 8 years ago
parent 547605885e 157f7617ca
commit e908413c13
1 changed files with 48 additions and 55 deletions
Show Stats Download Patch File Download Diff File

103
Signal/src/call/PeerConnectionClient.swift
Unescape Escape View File

@ -89,13 +89,9 @@ class PeerConnectionClient: NSObject, RTCPeerConnectionDelegate, RTCDataChannelD
private static let signalingQueue = DispatchQueue(label: "CallServiceSignalingQueue") private static let signalingQueue = DispatchQueue(label: "CallServiceSignalingQueue")
// Delegate is notified of key events in the call lifecycle. // Delegate is notified of key events in the call lifecycle.
private weak var delegate: PeerConnectionClientDelegate! //
// This property should only be accessed on the main thread.
func setDelegate(delegate: PeerConnectionClientDelegate?) { private weak var delegate: PeerConnectionClientDelegate?
PeerConnectionClient.signalingQueue.async {
self.delegate = delegate
}
}
// Connection // Connection
@ -271,12 +267,11 @@ class PeerConnectionClient: NSObject, RTCPeerConnectionDelegate, RTCDataChannelD
videoCaptureSession.stopRunning() videoCaptureSession.stopRunning()
} }
if let delegate = self.delegate { DispatchQueue.main.async { [weak self, weak localVideoTrack] in
DispatchQueue.main.async { [weak self, weak localVideoTrack] in guard let strongSelf = self else { return }
guard let strongSelf = self else { return } guard let strongLocalVideoTrack = localVideoTrack else { return }
guard let strongLocalVideoTrack = localVideoTrack else { return } guard let strongDelegate = strongSelf.delegate else { return }
delegate.peerConnectionClient(strongSelf, didUpdateLocal: enabled ? strongLocalVideoTrack : nil) strongDelegate.peerConnectionClient(strongSelf, didUpdateLocal: enabled ? strongLocalVideoTrack : nil)
}
} }
} }
} }
@ -496,6 +491,10 @@ class PeerConnectionClient: NSObject, RTCPeerConnectionDelegate, RTCDataChannelD
SwiftAssertIsOnMainThread(#function) SwiftAssertIsOnMainThread(#function)
Logger.debug("\(TAG) in \(#function)") Logger.debug("\(TAG) in \(#function)")
// Clear the delegate immediately so that we can guarantee that
// no delegate methods are called after terminate() returns.
delegate = nil
PeerConnectionClient.signalingQueue.async { PeerConnectionClient.signalingQueue.async {
assert(self.peerConnection != nil) assert(self.peerConnection != nil)
self.terminateInternal() self.terminateInternal()
@ -522,6 +521,7 @@ class PeerConnectionClient: NSObject, RTCPeerConnectionDelegate, RTCDataChannelD
// See the comments on the remoteVideoTrack property. // See the comments on the remoteVideoTrack property.
objc_sync_enter(self) objc_sync_enter(self)
localVideoTrack?.isEnabled = false localVideoTrack?.isEnabled = false
remoteVideoTrack?.isEnabled = false remoteVideoTrack?.isEnabled = false
@ -536,9 +536,8 @@ class PeerConnectionClient: NSObject, RTCPeerConnectionDelegate, RTCDataChannelD
peerConnection.delegate = nil peerConnection.delegate = nil
peerConnection.close() peerConnection.close()
peerConnection = nil peerConnection = nil
objc_sync_exit(self)
delegate = nil objc_sync_exit(self)
} }
// MARK: - Data Channel // MARK: - Data Channel
@ -608,11 +607,10 @@ class PeerConnectionClient: NSObject, RTCPeerConnectionDelegate, RTCDataChannelD
return return
} }
if let delegate = self.delegate { DispatchQueue.main.async { [weak self] in
DispatchQueue.main.async { [weak self] in guard let strongSelf = self else { return }
guard let strongSelf = self else { return } guard let strongDelegate = strongSelf.delegate else { return }
delegate.peerConnectionClient(strongSelf, received: dataChannelMessage) strongDelegate.peerConnectionClient(strongSelf, received: dataChannelMessage)
}
} }
} }
} }
@ -652,22 +650,21 @@ class PeerConnectionClient: NSObject, RTCPeerConnectionDelegate, RTCDataChannelD
return return
} }
if let delegate = self.delegate { DispatchQueue.main.async { [weak self] in
DispatchQueue.main.async { [weak self] in guard let strongSelf = self else { return }
guard let strongSelf = self else { return } guard let strongDelegate = strongSelf.delegate else { return }
// See the comments on the remoteVideoTrack property. // See the comments on the remoteVideoTrack property.
// //
// We only access the remoteVideoTrack property if peerConnection is non-nil. // We only access the remoteVideoTrack property if peerConnection is non-nil.
var remoteVideoTrack: RTCVideoTrack? var remoteVideoTrack: RTCVideoTrack?
objc_sync_enter(strongSelf) objc_sync_enter(strongSelf)
if strongSelf.peerConnection != nil { if strongSelf.peerConnection != nil {
remoteVideoTrack = strongSelf.remoteVideoTrack remoteVideoTrack = strongSelf.remoteVideoTrack
}
objc_sync_exit(strongSelf)
delegate.peerConnectionClient(strongSelf, didUpdateRemote: remoteVideoTrack)
} }
objc_sync_exit(strongSelf)
strongDelegate.peerConnectionClient(strongSelf, didUpdateRemote: remoteVideoTrack)
} }
} }
} }
@ -692,27 +689,24 @@ class PeerConnectionClient: NSObject, RTCPeerConnectionDelegate, RTCDataChannelD
Logger.info("\(self.TAG) didChange IceConnectionState:\(newState.debugDescription)") Logger.info("\(self.TAG) didChange IceConnectionState:\(newState.debugDescription)")
switch newState { switch newState {
case .connected, .completed: case .connected, .completed:
if let delegate = self.delegate { DispatchQueue.main.async { [weak self] in
DispatchQueue.main.async { [weak self] in guard let strongSelf = self else { return }
guard let strongSelf = self else { return } guard let strongDelegate = strongSelf.delegate else { return }
delegate.peerConnectionClientIceConnected(strongSelf) strongDelegate.peerConnectionClientIceConnected(strongSelf)
}
} }
case .failed: case .failed:
Logger.warn("\(self.TAG) RTCIceConnection failed.") Logger.warn("\(self.TAG) RTCIceConnection failed.")
if let delegate = self.delegate { DispatchQueue.main.async { [weak self] in
DispatchQueue.main.async { [weak self] in guard let strongSelf = self else { return }
guard let strongSelf = self else { return } guard let strongDelegate = strongSelf.delegate else { return }
delegate.peerConnectionClientIceFailed(strongSelf) strongDelegate.peerConnectionClientIceFailed(strongSelf)
}
} }
case .disconnected: case .disconnected:
Logger.warn("\(self.TAG) RTCIceConnection disconnected.") Logger.warn("\(self.TAG) RTCIceConnection disconnected.")
if let delegate = self.delegate { DispatchQueue.main.async { [weak self] in
DispatchQueue.main.async { [weak self] in guard let strongSelf = self else { return }
guard let strongSelf = self else { return } guard let strongDelegate = strongSelf.delegate else { return }
delegate.peerConnectionClientIceDisconnected(strongSelf) strongDelegate.peerConnectionClientIceDisconnected(strongSelf)
}
} }
default: default:
Logger.debug("\(self.TAG) ignoring change IceConnectionState:\(newState.debugDescription)") Logger.debug("\(self.TAG) ignoring change IceConnectionState:\(newState.debugDescription)")
@ -733,11 +727,10 @@ class PeerConnectionClient: NSObject, RTCPeerConnectionDelegate, RTCDataChannelD
return return
} }
Logger.info("\(self.TAG) adding local ICE candidate:\(candidate.sdp)") Logger.info("\(self.TAG) adding local ICE candidate:\(candidate.sdp)")
if let delegate = self.delegate { DispatchQueue.main.async { [weak self] in
DispatchQueue.main.async { [weak self] in guard let strongSelf = self else { return }
guard let strongSelf = self else { return } guard let strongDelegate = strongSelf.delegate else { return }
delegate.peerConnectionClient(strongSelf, addedLocalIceCandidate: candidate) strongDelegate.peerConnectionClient(strongSelf, addedLocalIceCandidate: candidate)
}
} }
} }
} }

Write Preview
Loading…
Cancel
Save