haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Notifies the focus about newly allocated channel SSRCs on add/remove source.

This commit is contained in:
George Politis 2015-05-18 19:00:12 +02:00
parent 0959b3d5b8
commit ad1772178d
1 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
modules/xmpp/JingleSession.js
View File

@ -54,8 +54,21 @@ function JingleSession(me, sid, connection, service) {
*/ */
this.videoMuteByUser = false; this.videoMuteByUser = false;
this.modifySourcesQueue = async.queue(this._modifySources.bind(this), 1); this.modifySourcesQueue = async.queue(this._modifySources.bind(this), 1);
// We start with the queue paused. We resume it when the signaling state is
// stable and the ice connection state is connected.
this.modifySourcesQueue.pause();
} }
JingleSession.prototype.updateModifySourcesQueue = function() {
var signalingState = this.peerconnection.signalingState;
var iceConnectionState = this.peerconnection.iceConnectionState;
if (signalingState === 'stable' && iceConnectionState === 'connected') {
this.modifySourcesQueue.resume();
} else {
this.modifySourcesQueue.pause();
}
};
//TODO: this array must be removed when firefox implement multistream support //TODO: this array must be removed when firefox implement multistream support
JingleSession.notReceivedSSRCs = []; JingleSession.notReceivedSSRCs = [];
@ -94,9 +107,11 @@ JingleSession.prototype.initiate = function (peerjid, isInitiator) {
}; };
this.peerconnection.onsignalingstatechange = function (event) { this.peerconnection.onsignalingstatechange = function (event) {
if (!(self && self.peerconnection)) return; if (!(self && self.peerconnection)) return;
self.updateModifySourcesQueue();
}; };
this.peerconnection.oniceconnectionstatechange = function (event) { this.peerconnection.oniceconnectionstatechange = function (event) {
if (!(self && self.peerconnection)) return; if (!(self && self.peerconnection)) return;
self.updateModifySourcesQueue();
switch (self.peerconnection.iceConnectionState) { switch (self.peerconnection.iceConnectionState) {
case 'connected': case 'connected':
this.startTime = new Date(); this.startTime = new Date();
@ -776,7 +791,17 @@ JingleSession.prototype.addSource = function (elem, fromJid) {
}); });
sdp.raw = sdp.session + sdp.media.join(''); sdp.raw = sdp.session + sdp.media.join('');
}); });
this.modifySourcesQueue.push();
this.modifySourcesQueue.push(function() {
// When a source is added and if this is FF, a new channel is allocated
// for receiving the added source. We need to diffuse the SSRC of this
// new recvonly channel to the rest of the peers.
console.log('modify sources done');
var newSdp = new SDP(self.peerconnection.localDescription.sdp);
console.log("SDPs", mySdp, newSdp);
self.notifyMySSRCUpdate(mySdp, newSdp);
});
}; };
JingleSession.prototype.removeSource = function (elem, fromJid) { JingleSession.prototype.removeSource = function (elem, fromJid) {
@ -837,7 +862,17 @@ JingleSession.prototype.removeSource = function (elem, fromJid) {
}); });
sdp.raw = sdp.session + sdp.media.join(''); sdp.raw = sdp.session + sdp.media.join('');
}); });
this.modifySourcesQueue.push();
this.modifySourcesQueue.push(function() {
// When a source is removed and if this is FF, the recvonly channel that
// receives the remote stream is deactivated . We need to diffuse the
// recvonly SSRC removal to the rest of the peers.
console.log('modify sources done');
var newSdp = new SDP(self.peerconnection.localDescription.sdp);
console.log("SDPs", mySdp, newSdp);
self.notifyMySSRCUpdate(mySdp, newSdp);
});
}; };
JingleSession.prototype._modifySources = function (successCallback, queueCallback) { JingleSession.prototype._modifySources = function (successCallback, queueCallback) {