Merge branch 'master' of https://github.com/Zalmoxisus/jitsi-meet

Conflicts:
	libs/modules/RTC.bundle.js
	libs/modules/simulcast.bundle.js

index.html

@@ -19,7 +19,7 @@
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
     <script src="interface_config.js?v=5"></script>
-    <script src="libs/app.bundle.js?v=1"></script>
+    <script src="libs/app.bundle.js?v=2"></script>
 
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
     <link rel="stylesheet" href="css/font.css?v=6"/>

libs/app.bundle.js

@@ -987,7 +987,9 @@ function getConstraints(um, resolution, bandwidth, fps, desktopStream, isAndroid
         }
     }
 
-    setResolutionConstraints(constraints, resolution, isAndroid);
+    if (um.indexOf('video') >= 0) {
+        setResolutionConstraints(constraints, resolution, isAndroid);
+    }
 
     if (bandwidth) { // doesn't work currently, see webrtc issue 1846
         if (!constraints.video) constraints.video = {mandatory: {}, optional: []};//same behaviour as true
@@ -9407,10 +9409,12 @@ NativeSimulcastSender.prototype._appendSimulcastGroup = function (lines) {
         simSSRC = this._generateRandomSSRC();
         ssrcGroup.push(simSSRC);
 
-        sb.splice.apply(sb, [sb.length, 0].concat(
-            [["a=ssrc:", simSSRC, " cname:", videoSources.base.cname].join(''),
-                ["a=ssrc:", simSSRC, " msid:", videoSources.base.msid].join('')]
-        ));
+        if (videoSources.base) {
+            sb.splice.apply(sb, [sb.length, 0].concat(
+                [["a=ssrc:", simSSRC, " cname:", videoSources.base.cname].join(''),
+                    ["a=ssrc:", simSSRC, " msid:", videoSources.base.msid].join('')]
+            ));
+        }
 
         this.logger.info(['Generated substream ', i, ' with SSRC ', simSSRC, '.'].join(''));
 

modules/RTC/RTCUtils.js

@@ -114,7 +114,9 @@ function getConstraints(um, resolution, bandwidth, fps, desktopStream, isAndroid
         }
     }
 
-    setResolutionConstraints(constraints, resolution, isAndroid);
+    if (um.indexOf('video') >= 0) {
+        setResolutionConstraints(constraints, resolution, isAndroid);
+    }
 
     if (bandwidth) { // doesn't work currently, see webrtc issue 1846
         if (!constraints.video) constraints.video = {mandatory: {}, optional: []};//same behaviour as true

modules/simulcast/SimulcastSender.js

@@ -78,10 +78,12 @@ NativeSimulcastSender.prototype._appendSimulcastGroup = function (lines) {
         simSSRC = this._generateRandomSSRC();
         ssrcGroup.push(simSSRC);
 
-        sb.splice.apply(sb, [sb.length, 0].concat(
-            [["a=ssrc:", simSSRC, " cname:", videoSources.base.cname].join(''),
-                ["a=ssrc:", simSSRC, " msid:", videoSources.base.msid].join('')]
-        ));
+        if (videoSources.base) {
+            sb.splice.apply(sb, [sb.length, 0].concat(
+                [["a=ssrc:", simSSRC, " cname:", videoSources.base.cname].join(''),
+                    ["a=ssrc:", simSSRC, " msid:", videoSources.base.msid].join('')]
+            ));
+        }
 
         this.logger.info(['Generated substream ', i, ' with SSRC ', simSSRC, '.'].join(''));