Skip to content

Commit

Permalink
fix bad merge task/libwebrtc-update-m69
Browse files Browse the repository at this point in the history
  • Loading branch information
hthetiot committed Oct 15, 2019
1 parent 39130cc commit 757c36c
Showing 1 changed file with 0 additions and 20 deletions.
20 changes: 0 additions & 20 deletions src/PluginRTCPeerConnection.swift
Original file line number Diff line number Diff line change
Expand Up @@ -599,27 +599,7 @@ class PluginRTCPeerConnection : NSObject, RTCPeerConnectionDelegate {
"streamId": stream.streamId
])
}
/** Called when the SignalingState changed. */

This comment has been minimized.

Copy link
@hthetiot

hthetiot Oct 15, 2019

Author Contributor

Remove duplicate code due bad merge master


// TODO: remove on M75
// This was already fixed in M-75, but note that "Issue 740501: RTCPeerConnection.onnegotiationneeded can sometimes fire multiple times in a row" was a prerequisite of Perfect Negotiation as well.
// https://stackoverflow.com/questions/48963787/failed-to-set-local-answer-sdp-called-in-wrong-state-kstable
// https://bugs.chromium.org/p/chromium/issues/detail?id=740501
// https://bugs.chromium.org/p/chromium/issues/detail?id=980872
var isNegotiating = false;

func peerConnection(_ peerConnection: RTCPeerConnection, didChange stateChanged: RTCSignalingState) {
let state_str = PluginRTCTypes.signalingStates[stateChanged.rawValue] as String?

NSLog("PluginRTCPeerConnection | onsignalingstatechange [signalingState:%@]", String(describing: state_str))

isNegotiating = (state_str != "stable")

self.eventListener([
"type": "signalingstatechange",
"signalingState": state_str!
])
}
/** Called when the SignalingState changed. */

// TODO: remove on M75
Expand Down

0 comments on commit 757c36c

Please sign in to comment.