Преглед на файлове

Removes unused code used to inject local SSRCs.

(cherry picked from commit 286225e81e)

# Conflicts:
#	modules/xmpp/SDP.js
master
paweldomas преди 9 години
родител
ревизия
dd54228913
променени са 2 файла, в които са добавени 4 реда и са изтрити 18 реда
  1. 2
    12
      modules/xmpp/JingleSessionPC.js
  2. 2
    6
      modules/xmpp/SDP.js

+ 2
- 12
modules/xmpp/JingleSessionPC.js Целия файл

@@ -42,7 +42,6 @@ function JingleSessionPC(me, sid, connection, service) {
42 42
     this.addingStreams = false;
43 43
 
44 44
     this.wait = true;
45
-    this.localStreamsSSRC = null;
46 45
     this.ssrcOwners = {};
47 46
     this.ssrcVideoTypes = {};
48 47
 
@@ -258,8 +257,7 @@ JingleSessionPC.prototype.accept = function () {
258 257
     // FIXME why do we generate session-accept in 3 different places ?
259 258
     prsdp.toJingle(
260 259
         accept,
261
-        this.initiator == this.me ? 'initiator' : 'responder',
262
-        this.localStreamsSSRC);
260
+        this.initiator == this.me ? 'initiator' : 'responder');
263 261
     var sdp = this.peerconnection.localDescription.sdp;
264 262
     while (SDPUtil.find_line(sdp, 'a=inactive')) {
265 263
         // FIXME: change any inactive to sendrecv or whatever they were originally
@@ -486,8 +484,7 @@ JingleSessionPC.prototype.createdOffer = function (sdp) {
486 484
                 sid: this.sid});
487 485
         self.localSDP.toJingle(
488 486
             init,
489
-            this.initiator == this.me ? 'initiator' : 'responder',
490
-            this.localStreamsSSRC);
487
+            this.initiator == this.me ? 'initiator' : 'responder');
491 488
 
492 489
         SSRCReplacement.processSessionInit(init);
493 490
 
@@ -1510,13 +1507,6 @@ JingleSessionPC.prototype.setLocalDescription = function () {
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 Целия файл

@@ -139,7 +139,7 @@ SDP.prototype.removeMediaLines = function(mediaindex, prefix) {
139 139
 }
140 140
 
141 141
 // add content's to a jingle element
142
-SDP.prototype.toJingle = function (elem, thecreator, ssrcs) {
142
+SDP.prototype.toJingle = function (elem, thecreator) {
143 143
 //    logger.log("SSRC" + ssrcs["audio"] + " - " + ssrcs["video"]);
144 144
     var self = this;
145 145
     var i, j, k, mline, ssrc, rtpmap, tmp, lines;
@@ -167,11 +167,7 @@ SDP.prototype.toJingle = function (elem, thecreator, ssrcs) {
167 167
         if (SDPUtil.find_line(this.media[i], 'a=ssrc:')) {
168 168
             ssrc = SDPUtil.find_line(this.media[i], 'a=ssrc:').substring(7).split(' ')[0]; // take the first
169 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 173
         elem.c('content', {creator: thecreator, name: mline.media});

Loading…
Отказ
Запис