Browse Source

Merge pull request #365 from saghul/disableRtx-default

rtx: set disableRtx default to true
dev1
George Politis 8 years ago
parent
commit
eda37a27c9
3 changed files with 7 additions and 10 deletions
  1. 1
    1
      modules/RTC/TraceablePeerConnection.js
  2. 5
    7
      modules/xmpp/moderator.js
  3. 1
    2
      modules/xmpp/xmpp.js

+ 1
- 1
modules/RTC/TraceablePeerConnection.js View File

894
     } else {
894
     } else {
895
         ssrcInfo = {ssrcs: [SDPUtil.generateSsrc()], groups: []};
895
         ssrcInfo = {ssrcs: [SDPUtil.generateSsrc()], groups: []};
896
     }
896
     }
897
-    if (!this.options.disableRtx) {
897
+    if (!this.options.disableRtx && !RTCBrowserType.isFirefox()) {
898
         // Specifically use a for loop here because we'll
898
         // Specifically use a for loop here because we'll
899
         //  be adding to the list we're iterating over, so we
899
         //  be adding to the list we're iterating over, so we
900
         //  only want to iterate through the items originally
900
         //  only want to iterate through the items originally

+ 5
- 7
modules/xmpp/moderator.js View File

147
                 value: this.options.conference.channelLastN
147
                 value: this.options.conference.channelLastN
148
             }).up();
148
             }).up();
149
     }
149
     }
150
-    if (this.options.conference.disableRtx !== undefined) {
151
-        elem.c(
152
-            'property', {
153
-                name: 'disableRtx',
154
-                value: this.options.conference.disableRtx
155
-            }).up();
156
-    }
150
+    elem.c(
151
+        'property', {
152
+            name: 'disableRtx',
153
+            value: !!this.options.conference.disableRtx
154
+        }).up();
157
     elem.c(
155
     elem.c(
158
         'property', {
156
         'property', {
159
             name: 'enableLipSync',
157
             name: 'enableLipSync',

+ 1
- 2
modules/xmpp/xmpp.js View File

66
         this.caps.addFeature('urn:xmpp:jingle:apps:rtp:audio');
66
         this.caps.addFeature('urn:xmpp:jingle:apps:rtp:audio');
67
         this.caps.addFeature('urn:xmpp:jingle:apps:rtp:video');
67
         this.caps.addFeature('urn:xmpp:jingle:apps:rtp:video');
68
 
68
 
69
-        if (RTCBrowserType.isChrome() || RTCBrowserType.isOpera()
70
-            || RTCBrowserType.isTemasysPluginUsed()) {
69
+        if (!this.options.disableRtx && !RTCBrowserType.isFirefox()) {
71
             this.caps.addFeature('urn:ietf:rfc:4588');
70
             this.caps.addFeature('urn:ietf:rfc:4588');
72
         }
71
         }
73
 
72
 

Loading…
Cancel
Save