Merge pull request #347 from jianjunz/merge-to-4.3.x

Pick a few commits to 4.3.x.

Author: jianjunz

src/sdk/base/mediastream-factory.js

@@ -150,11 +150,6 @@ export class MediaStreamFactory {
       return Promise.reject(
           new TypeError('Cannot share screen without video.'));
     }
-    if (isVideoConstrainsForScreenCast(constraints) && !utils.isChrome() &&
-        !utils.isFirefox()) {
-      return Promise.reject(
-          new TypeError('Screen sharing only supports Chrome and Firefox.'));
-    }
     if (isVideoConstrainsForScreenCast(constraints) &&
         typeof constraints.audio === 'object' &&
         constraints.audio.source !==

src/sdk/conference/streamutils.js

@@ -117,23 +117,29 @@ export function convertToSubscriptionCapabilities(mediaInfo) {
       }
     }
     videoCodecs.sort();
-    const resolutions = Array.from(
+    if (mediaInfo.video && mediaInfo.video.optional && mediaInfo.video.optional
+      .parameters) {
+      const resolutions = Array.from(
         mediaInfo.video.optional.parameters.resolution,
         (r) => new MediaFormatModule.Resolution(r.width, r.height));
-    resolutions.sort(sortResolutions);
-    const bitrates = Array.from(
+      resolutions.sort(sortResolutions);
+      const bitrates = Array.from(
         mediaInfo.video.optional.parameters.bitrate,
         (bitrate) => extractBitrateMultiplier(bitrate));
-    bitrates.push(1.0);
-    bitrates.sort(sortNumbers);
-    const frameRates = JSON.parse(
+      bitrates.push(1.0);
+      bitrates.sort(sortNumbers);
+      const frameRates = JSON.parse(
         JSON.stringify(mediaInfo.video.optional.parameters.framerate));
-    frameRates.sort(sortNumbers);
-    const keyFrameIntervals = JSON.parse(
+      frameRates.sort(sortNumbers);
+      const keyFrameIntervals = JSON.parse(
         JSON.stringify(mediaInfo.video.optional.parameters.keyFrameInterval));
-    keyFrameIntervals.sort(sortNumbers);
-    video = new SubscriptionModule.VideoSubscriptionCapabilities(
+      keyFrameIntervals.sort(sortNumbers);
+      video = new SubscriptionModule.VideoSubscriptionCapabilities(
         videoCodecs, resolutions, frameRates, bitrates, keyFrameIntervals);
+    } else {
+      video = new SubscriptionModule.VideoSubscriptionCapabilities(videoCodecs,
+        [], [], [1.0], []);
+    }
   }
   return new SubscriptionModule.SubscriptionCapabilities(audio, video);
 }

src/sdk/p2p/peerconnection-channel.js

@@ -661,7 +661,7 @@ class P2PPeerConnectionChannel extends EventDispatcher {
       this._pc.addTransceiver('audio');
       this._pc.addTransceiver('video');
     }
-    if (!this._isUnifiedPlan()) {
+    if (!this._isUnifiedPlan() && !Utils.isSafari()) {
       this._pc.onaddstream = (event) => {
         // TODO: Legacy API, should be removed when all UAs implemented WebRTC 1.0.
         this._onRemoteStreamAdded.apply(this, [event]);