Updates the generated files
This commit is contained in:
parent
9af330cc33
commit
e83d7b3b49
|
@ -7492,10 +7492,10 @@ JingleSessionPC.prototype.accept = function () {
|
|||
pranswer.sdp = pranswer.sdp.replace('a=inactive', 'a=sendrecv');
|
||||
}
|
||||
var prsdp = new SDP(pranswer.sdp);
|
||||
if (self.webrtcIceTcpDisable) {
|
||||
if (this.webrtcIceTcpDisable) {
|
||||
prsdp.removeTcpCandidates = true;
|
||||
}
|
||||
if (self.webrtcIceUdpDisable) {
|
||||
if (this.webrtcIceUdpDisable) {
|
||||
prsdp.removeUdpCandidates = true;
|
||||
}
|
||||
var accept = $iq({to: this.peerjid,
|
||||
|
@ -7815,13 +7815,12 @@ JingleSessionPC.prototype.getSsrcOwner = function (ssrc) {
|
|||
};
|
||||
|
||||
JingleSessionPC.prototype.setRemoteDescription = function (elem, desctype) {
|
||||
var self = this;
|
||||
//logger.log('setting remote description... ', desctype);
|
||||
this.remoteSDP = new SDP('');
|
||||
if (self.webrtcIceTcpDisable) {
|
||||
if (this.webrtcIceTcpDisable) {
|
||||
this.remoteSDP.removeTcpCandidates = true;
|
||||
}
|
||||
if (self.webrtcIceUdpDisable) {
|
||||
if (this.webrtcIceUdpDisable) {
|
||||
this.remoteSDP.removeUdpCandidates = true;
|
||||
}
|
||||
|
||||
|
@ -7982,6 +7981,8 @@ JingleSessionPC.prototype.addIceCandidate = function (elem) {
|
|||
self.peerconnection.addIceCandidate(candidate);
|
||||
} catch (e) {
|
||||
logger.error('addIceCandidate failed', e.toString(), line);
|
||||
self.room.eventEmitter.emit(XMPPEvents.ADD_ICE_CANDIDATE_FAILED,
|
||||
err, self.peerconnection);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
@ -8508,7 +8509,46 @@ JingleSessionPC.prototype.removeStream = function (stream, callback) {
|
|||
if(this.peerconnection.localDescription) {
|
||||
oldSdp = new SDP(this.peerconnection.localDescription.sdp);
|
||||
}
|
||||
if(stream)
|
||||
if (RTCBrowserType.getBrowserType() ===
|
||||
RTCBrowserType.RTC_BROWSER_FIREFOX) {
|
||||
var sender = null;
|
||||
// On Firefox we don't replace MediaStreams as this messes up the
|
||||
// m-lines (which can't be removed in Plan Unified) and brings a lot
|
||||
// of complications. Instead, we use the RTPSender and replace just
|
||||
// the track.
|
||||
var track = null;
|
||||
if(stream.getAudioTracks() && stream.getAudioTracks().length) {
|
||||
track = stream.getAudioTracks()[0];
|
||||
} else if(stream.getVideoTracks() && stream.getVideoTracks().length)
|
||||
{
|
||||
track = stream.getVideoTracks()[0];
|
||||
}
|
||||
|
||||
if(!track) {
|
||||
console.log("Cannot switch tracks: no tracks.");
|
||||
return;
|
||||
}
|
||||
|
||||
// Find the right sender (for audio or video)
|
||||
self.peerconnection.peerconnection.getSenders().some(function (s) {
|
||||
if (s.track === track) {
|
||||
sender = s;
|
||||
return true;
|
||||
}
|
||||
});
|
||||
|
||||
if (sender) {
|
||||
self.peerconnection.peerconnection.removeTrack(sender);
|
||||
// .then(function() {
|
||||
// console.log("Replaced a track, isAudio=" + isAudio);
|
||||
// })
|
||||
// .catch(function(err) {
|
||||
// console.log("Failed to replace a track: " + err);
|
||||
// });
|
||||
} else {
|
||||
console.log("Cannot switch tracks: no RTPSender.");
|
||||
}
|
||||
} else if(stream)
|
||||
this.peerconnection.removeStream(stream);
|
||||
}
|
||||
|
||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue