Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add/edge support #1151

Merged
merged 4 commits into from
Mar 1, 2018
Merged

Add/edge support #1151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f6a621
add max-bundle policy
kekkokk Feb 9, 2018
3590bee
Add support for Edge
kekkokk Feb 9, 2018
253f6a3
fix regression
kekkokk Feb 20, 2018
f5a6957
Merge branch 'master' into add/edge_support
jcague Mar 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion erizo_controller/common/semanticSdp/SDPInfo.js
View file
Open in desktop
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
View file
Open in desktop
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');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this break something in Chrome/Firefox?

Copy link
Contributor Author

@kekkokk kekkokk Feb 20, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is bulletproof. Also should speed up the ice process a bit and seems a best practice

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is breaking things in chrome, local and remote stream turns black after merging this change

media.setICE(thisIceInfo);
}

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