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

Merge pull request #365 from saghul/disableRtx-default

rtx: set disableRtx default to true
dev1
George Politis преди 8 години
родител
ревизия
eda37a27c9
променени са 3 файла, в които са добавени 7 реда и са изтрити 10 реда
  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 Целия файл

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

+ 5
- 7
modules/xmpp/moderator.js Целия файл

@@ -147,13 +147,11 @@ Moderator.prototype.createConferenceIq =  function () {
147 147
                 value: this.options.conference.channelLastN
148 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 155
     elem.c(
158 156
         'property', {
159 157
             name: 'enableLipSync',

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

@@ -66,8 +66,7 @@ export default class XMPP extends Listenable {
66 66
         this.caps.addFeature('urn:xmpp:jingle:apps:rtp:audio');
67 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 70
             this.caps.addFeature('urn:ietf:rfc:4588');
72 71
         }
73 72
 

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