瀏覽代碼

Fixes audio-only (when GUM fails)

j8
Zalmoxisus 10 年之前
父節點
當前提交
40de181959
共有 4 個檔案被更改,包括 18 行新增10 行删除
  1. 3
    1
      libs/modules/RTC.bundle.js
  2. 6
    4
      libs/modules/simulcast.bundle.js
  3. 3
    1
      modules/RTC/RTCUtils.js
  4. 6
    4
      modules/simulcast/SimulcastSender.js

+ 3
- 1
libs/modules/RTC.bundle.js 查看文件

700
         }
700
         }
701
     }
701
     }
702
 
702
 
703
-    setResolutionConstraints(constraints, resolution, isAndroid);
703
+    if (um.indexOf('video') >= 0) {
704
+        setResolutionConstraints(constraints, resolution, isAndroid);
705
+    }
704
 
706
 
705
     if (bandwidth) { // doesn't work currently, see webrtc issue 1846
707
     if (bandwidth) { // doesn't work currently, see webrtc issue 1846
706
         if (!constraints.video) constraints.video = {mandatory: {}, optional: []};//same behaviour as true
708
         if (!constraints.video) constraints.video = {mandatory: {}, optional: []};//same behaviour as true

+ 6
- 4
libs/modules/simulcast.bundle.js 查看文件

380
         simSSRC = this._generateRandomSSRC();
380
         simSSRC = this._generateRandomSSRC();
381
         ssrcGroup.push(simSSRC);
381
         ssrcGroup.push(simSSRC);
382
 
382
 
383
-        sb.splice.apply(sb, [sb.length, 0].concat(
384
-            [["a=ssrc:", simSSRC, " cname:", videoSources.base.cname].join(''),
385
-                ["a=ssrc:", simSSRC, " msid:", videoSources.base.msid].join('')]
386
-        ));
383
+        if (videoSources.base) {
384
+            sb.splice.apply(sb, [sb.length, 0].concat(
385
+                [["a=ssrc:", simSSRC, " cname:", videoSources.base.cname].join(''),
386
+                    ["a=ssrc:", simSSRC, " msid:", videoSources.base.msid].join('')]
387
+            ));
388
+        }
387
 
389
 
388
         this.logger.info(['Generated substream ', i, ' with SSRC ', simSSRC, '.'].join(''));
390
         this.logger.info(['Generated substream ', i, ' with SSRC ', simSSRC, '.'].join(''));
389
 
391
 

+ 3
- 1
modules/RTC/RTCUtils.js 查看文件

115
         }
115
         }
116
     }
116
     }
117
 
117
 
118
-    setResolutionConstraints(constraints, resolution, isAndroid);
118
+    if (um.indexOf('video') >= 0) {
119
+        setResolutionConstraints(constraints, resolution, isAndroid);
120
+    }
119
 
121
 
120
     if (bandwidth) { // doesn't work currently, see webrtc issue 1846
122
     if (bandwidth) { // doesn't work currently, see webrtc issue 1846
121
         if (!constraints.video) constraints.video = {mandatory: {}, optional: []};//same behaviour as true
123
         if (!constraints.video) constraints.video = {mandatory: {}, optional: []};//same behaviour as true

+ 6
- 4
modules/simulcast/SimulcastSender.js 查看文件

78
         simSSRC = this._generateRandomSSRC();
78
         simSSRC = this._generateRandomSSRC();
79
         ssrcGroup.push(simSSRC);
79
         ssrcGroup.push(simSSRC);
80
 
80
 
81
-        sb.splice.apply(sb, [sb.length, 0].concat(
82
-            [["a=ssrc:", simSSRC, " cname:", videoSources.base.cname].join(''),
83
-                ["a=ssrc:", simSSRC, " msid:", videoSources.base.msid].join('')]
84
-        ));
81
+        if (videoSources.base) {
82
+            sb.splice.apply(sb, [sb.length, 0].concat(
83
+                [["a=ssrc:", simSSRC, " cname:", videoSources.base.cname].join(''),
84
+                    ["a=ssrc:", simSSRC, " msid:", videoSources.base.msid].join('')]
85
+            ));
86
+        }
85
 
87
 
86
         this.logger.info(['Generated substream ', i, ' with SSRC ', simSSRC, '.'].join(''));
88
         this.logger.info(['Generated substream ', i, ' with SSRC ', simSSRC, '.'].join(''));
87
 
89
 

Loading…
取消
儲存