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

Fixes focus addSource/removeSource methods.

This commit is contained in:
George Politis 2014-11-12 11:41:02 +01:00
parent 3c21b09fa4
commit 19e4955392
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libs/colibri/colibri.focus.js
View File

@ -1099,17 +1099,31 @@ ColibriFocus.prototype.addSource = function (elem, fromJid) {
this.peerconnection.addSource(elem); this.peerconnection.addSource(elem);
// NOTE(gp) this could be a useful thing to have in every Array object.
var diffArray = function(a) {
return this.filter(function(i) {return a.indexOf(i) < 0;});
};
var peerSsrc = this.remotessrc[fromJid]; var peerSsrc = this.remotessrc[fromJid];
//console.log("On ADD", self.addssrc, peerSsrc); // console.log("On ADD", this.peerconnection.addssrc, peerSsrc);
this.peerconnection.addssrc.forEach(function(val, idx){ this.peerconnection.addssrc.forEach(function(val, idx){
if(!peerSsrc[idx]){ if(!peerSsrc[idx]){
// add ssrc // add ssrc
peerSsrc[idx] = val; peerSsrc[idx] = val;
} else { } else if (val) {
if(peerSsrc[idx].indexOf(val) == -1){ // NOTE(gp) we can't expect the lines in the removessrc SDP fragment
// to be in the same order as in the lines in the peerSsrc SDP
// fragment. So, here we remove the val lines and re-add them.
var lines = peerSsrc[idx].split('\r\n');
var diffLines = val.split('\r\n');
// Remove ssrc
peerSsrc[idx] = diffArray.apply(lines, [diffLines]).join('\r\n');
// Add ssrc
peerSsrc[idx] = peerSsrc[idx]+val; peerSsrc[idx] = peerSsrc[idx]+val;
} }
}
}); });
var oldRemoteSdp = new SDP(this.peerconnection.remoteDescription.sdp); var oldRemoteSdp = new SDP(this.peerconnection.remoteDescription.sdp);
@ -1150,12 +1164,22 @@ ColibriFocus.prototype.removeSource = function (elem, fromJid) {
this.peerconnection.removeSource(elem); this.peerconnection.removeSource(elem);
// NOTE(gp) this could be a useful thing to have in every Array object.
var diffArray = function(a) {
return this.filter(function(i) {return a.indexOf(i) < 0;});
};
var peerSsrc = this.remotessrc[fromJid]; var peerSsrc = this.remotessrc[fromJid];
//console.log("On REMOVE", self.removessrc, peerSsrc); // console.log("On REMOVE", this.peerconnection.removessrc, peerSsrc);
this.peerconnection.removessrc.forEach(function(val, idx){ this.peerconnection.removessrc.forEach(function(val, idx){
if(peerSsrc[idx]){ if(peerSsrc[idx] && val){
// NOTE(gp) we can't expect the lines in the removessrc SDP fragment
// to be in the same order as in the lines in the peerSsrc SDP
// fragment.
var lines = peerSsrc[idx].split('\r\n');
var diffLines = val.split('\r\n');
// Remove ssrc // Remove ssrc
peerSsrc[idx] = peerSsrc[idx].replace(val, ''); peerSsrc[idx] = diffArray.apply(lines, [diffLines]).join('\r\n');
} }
}); });