diff --git a/modules/xmpp/JingleSessionPC.js b/modules/xmpp/JingleSessionPC.js index 6500e6186..e7772a9d4 100644 --- a/modules/xmpp/JingleSessionPC.js +++ b/modules/xmpp/JingleSessionPC.js @@ -40,7 +40,6 @@ function JingleSessionPC(me, sid, connection, service, eventEmitter) { this.switchstreams = false; this.wait = true; - this.localStreamsSSRC = null; this.ssrcOwners = {}; this.ssrcVideoTypes = {}; this.eventEmitter = eventEmitter; @@ -256,8 +255,7 @@ JingleSessionPC.prototype.accept = function () { // FIXME why do we generate session-accept in 3 different places ? prsdp.toJingle( accept, - this.initiator == this.me ? 'initiator' : 'responder', - this.localStreamsSSRC); + this.initiator == this.me ? 'initiator' : 'responder'); var sdp = this.peerconnection.localDescription.sdp; while (SDPUtil.find_line(sdp, 'a=inactive')) { // FIXME: change any inactive to sendrecv or whatever they were originally @@ -484,8 +482,7 @@ JingleSessionPC.prototype.createdOffer = function (sdp) { sid: this.sid}); self.localSDP.toJingle( init, - this.initiator == this.me ? 'initiator' : 'responder', - this.localStreamsSSRC); + this.initiator == this.me ? 'initiator' : 'responder'); 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 - }); - } }); diff --git a/modules/xmpp/SDP.js b/modules/xmpp/SDP.js index bacbe77ed..fc24b4d34 100644 --- a/modules/xmpp/SDP.js +++ b/modules/xmpp/SDP.js @@ -139,7 +139,7 @@ SDP.prototype.removeMediaLines = function(mediaindex, prefix) { }; // 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"]); var i, j, k, mline, ssrc, rtpmap, tmp, lines; // new bundle plan @@ -166,11 +166,7 @@ SDP.prototype.toJingle = function (elem, thecreator, ssrcs) { 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 } else { - if(ssrcs && ssrcs[mline.media]) { - ssrc = ssrcs[mline.media]; - } else { - ssrc = false; - } + ssrc = false; } elem.c('content', {creator: thecreator, name: mline.media});