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

Use adapter.js #940

Merged
merged 6 commits into from
Jun 30, 2017
Merged

Use adapter.js #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5c73b28
Use adapter js and a little cleanup
lodoyun Jun 29, 2017
6bc90fd
Removed bowser properly
lodoyun Jun 30, 2017
5f500b1
Merge branch 'master' into add/useAdapterjs
lodoyun Jun 30, 2017
bd3a360
Merge branch 'master' into add/useAdapterjs
lodoyun Jun 30, 2017
3c0f625
Fixed crash when adding last candidate in Firefox on audio only
lodoyun Jun 30, 2017
4e07c12
Merge branch 'master' into add/useAdapterjs
lodoyun Jun 30, 2017
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
11 changes: 9 additions & 2 deletions erizo/src/erizo/WebRtcConnection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,11 +305,18 @@ bool WebRtcConnection::addRemoteCandidate(const std::string &mid, int mLineIndex
}
MediaType theType;
std::string theMid;
// Checking if it's the last candidate, only works in bundle.

// TODO(pedro) check if this works with video+audio and no bundle
if (mLineIndex == -1) {
ELOG_DEBUG("%s message: All candidates received", toLog());
videoTransport_->getIceConnection()->setReceivedLastCandidate(true);
if (videoTransport_) {
videoTransport_->getIceConnection()->setReceivedLastCandidate(true);
} else if (audioTransport_) {
audioTransport_->getIceConnection()->setReceivedLastCandidate(true);
}
return true;
}

if ((!mid.compare("video")) || (mLineIndex == remoteSdp_.videoSdpMLine)) {
theType = VIDEO_TYPE;
theMid = "video";
Expand Down
Loading