Browse Source

Removes unused code used to inject local SSRCs.

(cherry picked from commit 286225e81e)

# Conflicts:
#	modules/xmpp/SDP.js
dev1
paweldomas 9 years ago
parent
commit
dd54228913
2 changed files with 4 additions and 18 deletions
  1. 2
    12
      modules/xmpp/JingleSessionPC.js
  2. 2
    6
      modules/xmpp/SDP.js

+ 2
- 12
modules/xmpp/JingleSessionPC.js View File

42
     this.addingStreams = false;
42
     this.addingStreams = false;
43
 
43
 
44
     this.wait = true;
44
     this.wait = true;
45
-    this.localStreamsSSRC = null;
46
     this.ssrcOwners = {};
45
     this.ssrcOwners = {};
47
     this.ssrcVideoTypes = {};
46
     this.ssrcVideoTypes = {};
48
 
47
 
258
     // FIXME why do we generate session-accept in 3 different places ?
257
     // FIXME why do we generate session-accept in 3 different places ?
259
     prsdp.toJingle(
258
     prsdp.toJingle(
260
         accept,
259
         accept,
261
-        this.initiator == this.me ? 'initiator' : 'responder',
262
-        this.localStreamsSSRC);
260
+        this.initiator == this.me ? 'initiator' : 'responder');
263
     var sdp = this.peerconnection.localDescription.sdp;
261
     var sdp = this.peerconnection.localDescription.sdp;
264
     while (SDPUtil.find_line(sdp, 'a=inactive')) {
262
     while (SDPUtil.find_line(sdp, 'a=inactive')) {
265
         // FIXME: change any inactive to sendrecv or whatever they were originally
263
         // FIXME: change any inactive to sendrecv or whatever they were originally
486
                 sid: this.sid});
484
                 sid: this.sid});
487
         self.localSDP.toJingle(
485
         self.localSDP.toJingle(
488
             init,
486
             init,
489
-            this.initiator == this.me ? 'initiator' : 'responder',
490
-            this.localStreamsSSRC);
487
+            this.initiator == this.me ? 'initiator' : 'responder');
491
 
488
 
492
         SSRCReplacement.processSessionInit(init);
489
         SSRCReplacement.processSessionInit(init);
493
 
490
 
1510
                 });
1507
                 });
1511
             });
1508
             });
1512
         }
1509
         }
1513
-        else if(self.localStreamsSSRC && self.localStreamsSSRC[media.type])
1514
-        {
1515
-            newssrcs.push({
1516
-                'ssrc': self.localStreamsSSRC[media.type],
1517
-                'type': media.type
1518
-            });
1519
-        }
1520
 
1510
 
1521
     });
1511
     });
1522
 
1512
 

+ 2
- 6
modules/xmpp/SDP.js View File

139
 }
139
 }
140
 
140
 
141
 // add content's to a jingle element
141
 // add content's to a jingle element
142
-SDP.prototype.toJingle = function (elem, thecreator, ssrcs) {
142
+SDP.prototype.toJingle = function (elem, thecreator) {
143
 //    logger.log("SSRC" + ssrcs["audio"] + " - " + ssrcs["video"]);
143
 //    logger.log("SSRC" + ssrcs["audio"] + " - " + ssrcs["video"]);
144
     var self = this;
144
     var self = this;
145
     var i, j, k, mline, ssrc, rtpmap, tmp, lines;
145
     var i, j, k, mline, ssrc, rtpmap, tmp, lines;
167
         if (SDPUtil.find_line(this.media[i], 'a=ssrc:')) {
167
         if (SDPUtil.find_line(this.media[i], 'a=ssrc:')) {
168
             ssrc = SDPUtil.find_line(this.media[i], 'a=ssrc:').substring(7).split(' ')[0]; // take the first
168
             ssrc = SDPUtil.find_line(this.media[i], 'a=ssrc:').substring(7).split(' ')[0]; // take the first
169
         } else {
169
         } else {
170
-            if(ssrcs && ssrcs[mline.media]) {
171
-                ssrc = ssrcs[mline.media];
172
-            } else {
173
-                ssrc = false;
174
-            }
170
+            ssrc = false;
175
         }
171
         }
176
 
172
 
177
         elem.c('content', {creator: thecreator, name: mline.media});
173
         elem.c('content', {creator: thecreator, name: mline.media});

Loading…
Cancel
Save