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

Removes unused code used to inject local SSRCs.

This commit is contained in:
paweldomas 2015-11-25 11:56:58 -06:00
parent b2a3866fe4
commit 286225e81e
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/xmpp/JingleSessionPC.js
View File

@ -40,7 +40,6 @@ function JingleSessionPC(me, sid, connection, service, eventEmitter) {
this.switchstreams = false; this.switchstreams = false;
this.wait = true; this.wait = true;
this.localStreamsSSRC = null;
this.ssrcOwners = {}; this.ssrcOwners = {};
this.ssrcVideoTypes = {}; this.ssrcVideoTypes = {};
this.eventEmitter = eventEmitter; this.eventEmitter = eventEmitter;
@ -256,8 +255,7 @@ JingleSessionPC.prototype.accept = function () {
// FIXME why do we generate session-accept in 3 different places ? // FIXME why do we generate session-accept in 3 different places ?
prsdp.toJingle( prsdp.toJingle(
accept, accept,
this.initiator == this.me ? 'initiator' : 'responder', this.initiator == this.me ? 'initiator' : 'responder');
this.localStreamsSSRC);
var sdp = this.peerconnection.localDescription.sdp; var sdp = this.peerconnection.localDescription.sdp;
while (SDPUtil.find_line(sdp, 'a=inactive')) { while (SDPUtil.find_line(sdp, 'a=inactive')) {
// FIXME: change any inactive to sendrecv or whatever they were originally // FIXME: change any inactive to sendrecv or whatever they were originally
@ -484,8 +482,7 @@ JingleSessionPC.prototype.createdOffer = function (sdp) {
sid: this.sid}); sid: this.sid});
self.localSDP.toJingle( self.localSDP.toJingle(
init, init,
this.initiator == this.me ? 'initiator' : 'responder', this.initiator == this.me ? 'initiator' : 'responder');
this.localStreamsSSRC);
SSRCReplacement.processSessionInit(init); SSRCReplacement.processSessionInit(init);
@ -1429,13 +1426,6 @@ JingleSessionPC.prototype.setLocalDescription = function () {
}); });
}); });
} }
else if(self.localStreamsSSRC && self.localStreamsSSRC[media.type])
{
newssrcs.push({
'ssrc': self.localStreamsSSRC[media.type],
'type': media.type
});
}
}); });

6
modules/xmpp/SDP.js
View File

@ -139,7 +139,7 @@ SDP.prototype.removeMediaLines = function(mediaindex, prefix) {
}; };
// add content's to a jingle element // add content's to a jingle element
SDP.prototype.toJingle = function (elem, thecreator, ssrcs) { SDP.prototype.toJingle = function (elem, thecreator) {
// console.log("SSRC" + ssrcs["audio"] + " - " + ssrcs["video"]); // console.log("SSRC" + ssrcs["audio"] + " - " + ssrcs["video"]);
var i, j, k, mline, ssrc, rtpmap, tmp, lines; var i, j, k, mline, ssrc, rtpmap, tmp, lines;
// new bundle plan // new bundle plan
@ -165,13 +165,9 @@ SDP.prototype.toJingle = function (elem, thecreator, ssrcs) {
} }
if (SDPUtil.find_line(this.media[i], 'a=ssrc:')) { if (SDPUtil.find_line(this.media[i], 'a=ssrc:')) {
ssrc = SDPUtil.find_line(this.media[i], 'a=ssrc:').substring(7).split(' ')[0]; // take the first ssrc = SDPUtil.find_line(this.media[i], 'a=ssrc:').substring(7).split(' ')[0]; // take the first
} else {
if(ssrcs && ssrcs[mline.media]) {
ssrc = ssrcs[mline.media];
} else { } else {
ssrc = false; ssrc = false;
} }
}
elem.c('content', {creator: thecreator, name: mline.media}); elem.c('content', {creator: thecreator, name: mline.media});
if (SDPUtil.find_line(this.media[i], 'a=mid:')) { if (SDPUtil.find_line(this.media[i], 'a=mid:')) {