Skip to content

Commit

Permalink
Improve MS Edge support (#1151)
Browse files Browse the repository at this point in the history
  • Loading branch information
kekkokk authored and jcague committed Mar 1, 2018
1 parent e83e4c9 commit 8a745da
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
9 changes: 8 additions & 1 deletion erizo_controller/common/semanticSdp/SDPInfo.js
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,9 @@ class SDPInfo {
md.iceOptions = ice.getOpts();
md.iceUfrag = ice.getUfrag();
md.icePwd = ice.getPwd();
if (ice.isEndOfCandidates()) {
md.endOfCandidates = ice.isEndOfCandidates();
}
}

dtls = media.getDTLS();
Expand Down Expand Up @@ -777,7 +780,11 @@ SDPInfo.process = (sdp) => {
pwd = md.icePwd;
iceOptions = md.iceOptions;
if (ufrag || pwd || iceOptions) {
mediaInfo.setICE(new ICEInfo(ufrag, pwd, iceOptions));
const thisIce = new ICEInfo(ufrag, pwd, iceOptions);
if (md.endOfCandidates) {
thisIce.setEndOfCandidates('end-of-candidates');
}
mediaInfo.setICE(thisIce);
}

fingerprintAttr = md.fingerprint;
Expand Down
4 changes: 3 additions & 1 deletion erizo_controller/erizoJS/models/SessionDescription.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ function getMediaInfoFromDescription(info, sdp, mediaType) {

let ice = info.getICECredentials(mediaType);
if (ice) {
media.setICE(new ICEInfo(ice[0], ice[1]));
const thisIceInfo = new ICEInfo(ice[0], ice[1]);
thisIceInfo.setEndOfCandidates('end-of-candidates');
media.setICE(thisIceInfo);
}

const fingerprint = info.getFingerprint(mediaType);
Expand Down

0 comments on commit 8a745da

Please sign in to comment.