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

Removes unused code used to inject local SSRCs. 

(cherry picked from commit 286225e81e)

# Conflicts:
#	modules/xmpp/SDP.js
This commit is contained in:
paweldomas 2015-12-08 19:07:36 -06:00
parent df4ec063a5
commit 293913f525
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

@ -42,7 +42,6 @@ function JingleSessionPC(me, sid, connection, service) {
this.addingStreams = false;
this.wait = true;
this.localStreamsSSRC = null;
this.ssrcOwners = {};
this.ssrcVideoTypes = {};
@ -258,8 +257,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
@ -486,8 +484,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);
@ -1510,13 +1507,6 @@ JingleSessionPC.prototype.setLocalDescription = function () {
});
});
}
else if(self.localStreamsSSRC && self.localStreamsSSRC[media.type])
{
newssrcs.push({
'ssrc': self.localStreamsSSRC[media.type],
'type': media.type
});
}
});

8
modules/xmpp/SDP.js
View File

@ -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) {
// logger.log("SSRC" + ssrcs["audio"] + " - " + ssrcs["video"]);
var self = this;
var i, j, k, mline, ssrc, rtpmap, tmp, lines;
@ -167,11 +167,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});