@flashphoner/websdk 2.0.238 → 2.0.239

package/flashphoner-no-wsplayer.js

@@ -7514,15 +7514,15 @@ var _require = require('uuid'),
 var constants = require("./constants");
 var util = require('./util');
 var LoggerObject = require('./util').logger;
+var Promise = require('promise-polyfill');
+var KalmanFilter = require('kalmanjs');
+var browserDetails = require('webrtc-adapter')["default"].browserDetails;
+var LOG_PREFIX = "core";
 var coreLogger;
 var loggerConf = {
   push: false,
   severity: "INFO"
 };
-var Promise = require('promise-polyfill');
-var KalmanFilter = require('kalmanjs');
-var browserDetails = require('webrtc-adapter')["default"].browserDetails;
-var LOG_PREFIX = "core";
 var isUsingTemasysPlugin = false;
 
 /**
@@ -7534,7 +7534,6 @@ var STREAM_EVENT = constants.STREAM_EVENT;
 var STREAM_EVENT_TYPE = constants.STREAM_EVENT_TYPE;
 var STREAM_STATUS = constants.STREAM_STATUS;
 var CALL_STATUS = constants.CALL_STATUS;
-var TRANSPORT_TYPE = constants.TRANSPORT_TYPE;
 var CONNECTION_QUALITY = constants.CONNECTION_QUALITY;
 var ERROR_INFO = constants.ERROR_INFO;
 var VIDEO_RATE_GOOD_QUALITY_PERCENT_DIFFERENCE = 20;
@@ -7543,6 +7542,18 @@ var LOW_VIDEO_RATE_THRESHOLD_BAD_PERFECT = 50000;
 var LOW_VIDEO_RATE_BAD_QUALITY_PERCENT_DIFFERENCE = 150;
 var OUTBOUND_VIDEO_RATE = "outboundVideoRate";
 var INBOUND_VIDEO_RATE = "inboundVideoRate";
+var CONSTRAINT_AUDIO = "audio";
+var CONSTRAINT_AUDIO_STEREO = "stereo";
+var CONSTRAINT_AUDIO_BITRATE = "bitrate";
+var CONSTRAINT_AUDIO_FEC = "fec";
+var CONSTRAINT_AUDIO_OUTPUT_ID = "outputId";
+var CONSTRAINT_VIDEO = "video";
+var CONSTRAINT_VIDEO_BITRATE = "video.bitrate";
+var CONSTRAINT_VIDEO_MIN_BITRATE = "video.minBitrate";
+var CONSTRAINT_VIDEO_MAX_BITRATE = "video.maxBitrate";
+var CONSTRAINT_VIDEO_QUALITY = "video.quality";
+var CONSTRAINT_VIDEO_WIDTH = "video.width";
+var CONSTRAINT_VIDEO_HEIGHT = "video.height";
 var MediaProvider = {};
 var sessions = {};
 var initialized = false;
@@ -8372,9 +8383,9 @@ var createSession = function createSession(options) {
       var disableConstraintsNormalization = options.disableConstraintsNormalization;
     }
     var audioOutputId;
-    var audioProperty = getConstraintsProperty(constraints, "audio", undefined);
+    var audioProperty = getConstraintsProperty(constraints, CONSTRAINT_AUDIO, undefined);
     if (_typeof(audioProperty) === 'object') {
-      audioOutputId = getConstraintsProperty(audioProperty, "outputId", 0);
+      audioOutputId = getConstraintsProperty(audioProperty, CONSTRAINT_AUDIO_OUTPUT_ID, 0);
     }
     var stripCodecs = options.stripCodecs || [];
     // Receive media
@@ -8389,6 +8400,9 @@ var createSession = function createSession(options) {
     var sipHeaders = options.sipHeaders;
     var videoContentHint = options.videoContentHint;
     var useControls = options.useControls;
+    var minBitrate = getConstraintsProperty(constraints, CONSTRAINT_VIDEO_MIN_BITRATE, 0);
+    var maxBitrate = getConstraintsProperty(constraints, CONSTRAINT_VIDEO_MAX_BITRATE, 0);
+
     /**
      * Represents sip call.
      *
@@ -8425,6 +8439,8 @@ var createSession = function createSession(options) {
       //set remote sdp
       if (sdp && sdp !== '') {
         sdp = sdpHookHandler(sdp, sdpHook);
+        // Adjust publishing bitrate #WCS-4013
+        sdp = util.setPublishingBitrate(sdp, mediaConnection, minBitrate, maxBitrate);
         mediaConnection.setRemoteSdp(sdp, hasTransferredCall, id_).then(function () {});
         return;
       }
@@ -8590,6 +8606,8 @@ var createSession = function createSession(options) {
       status_ = CALL_STATUS.PENDING;
       var sdp;
       var sdpHook = answerOptions.sdpHook;
+      var minBitrate = getConstraintsProperty(constraints, CONSTRAINT_VIDEO_MIN_BITRATE, 0);
+      var maxBitrate = getConstraintsProperty(constraints, CONSTRAINT_VIDEO_MAX_BITRATE, 0);
       sipSDP = answerOptions.sipSDP;
       sipHeaders = answerOptions.sipHeaders;
       if (!remoteSdpCache[id_]) {
@@ -8597,6 +8615,8 @@ var createSession = function createSession(options) {
         throw new Error("No remote sdp available");
       } else {
         sdp = sdpHookHandler(remoteSdpCache[id_], sdpHook);
+        // Adjust publishing bitrate #WCS-4013
+        sdp = util.setPublishingBitrate(sdp, null, minBitrate, maxBitrate);
         delete remoteSdpCache[id_];
       }
       if (util.SDP.matchPrefix(sdp, "m=video").length == 0) {
@@ -8630,6 +8650,8 @@ var createSession = function createSession(options) {
           useControls: useControls
         }).then(function (newConnection) {
           mediaConnection = newConnection;
+          // Set publishing bitrate via sender encodings if SDP feature is not supported
+          mediaConnection.setPublishingBitrate(minBitrate, maxBitrate);
           return mediaConnection.setRemoteSdp(sdp);
         }).then(function () {
           return mediaConnection.createAnswer({
@@ -9164,15 +9186,15 @@ var createSession = function createSession(options) {
     // Receive media
     var receiveAudio;
     var audioOutputId;
-    var audioProperty = getConstraintsProperty(constraints, "audio", undefined);
+    var audioProperty = getConstraintsProperty(constraints, CONSTRAINT_AUDIO, undefined);
     if (typeof audioProperty === 'boolean') {
       receiveAudio = audioProperty;
     } else if (_typeof(audioProperty) === 'object') {
       receiveAudio = true;
-      var _stereo = getConstraintsProperty(audioProperty, "stereo", 0);
-      var _bitrate = getConstraintsProperty(audioProperty, "bitrate", 0);
-      var _fec = getConstraintsProperty(audioProperty, "fec", 0);
-      audioOutputId = getConstraintsProperty(audioProperty, "outputId", 0);
+      var _stereo = getConstraintsProperty(audioProperty, CONSTRAINT_AUDIO_STEREO, 0);
+      var _bitrate = getConstraintsProperty(audioProperty, CONSTRAINT_AUDIO_BITRATE, 0);
+      var _fec = getConstraintsProperty(audioProperty, CONSTRAINT_AUDIO_FEC, 0);
+      audioOutputId = getConstraintsProperty(audioProperty, CONSTRAINT_AUDIO_OUTPUT_ID, 0);
       var _codecOptions = "";
       if (_bitrate) _codecOptions += "maxaveragebitrate=" + _bitrate + ";";
       if (_stereo) _codecOptions += "stereo=1;sprop-stereo=1;";
@@ -9181,7 +9203,7 @@ var createSession = function createSession(options) {
       receiveAudio = typeof options.receiveAudio !== 'undefined' ? options.receiveAudio : true;
     }
     var receiveVideo;
-    var videoProperty = getConstraintsProperty(constraints, "video", undefined);
+    var videoProperty = getConstraintsProperty(constraints, CONSTRAINT_VIDEO, undefined);
     if (typeof videoProperty === 'boolean') {
       receiveVideo = videoProperty;
     } else if (_typeof(videoProperty) === 'object') {
@@ -9190,16 +9212,16 @@ var createSession = function createSession(options) {
       receiveVideo = typeof options.receiveVideo !== 'undefined' ? options.receiveVideo : true;
     }
     // Bitrate
-    var bitrate = getConstraintsProperty(constraints, "video.bitrate", 0);
-    var minBitrate = getConstraintsProperty(constraints, "video.minBitrate", 0);
-    var maxBitrate = getConstraintsProperty(constraints, "video.maxBitrate", 0);
+    var bitrate = getConstraintsProperty(constraints, CONSTRAINT_VIDEO_BITRATE, 0);
+    var minBitrate = getConstraintsProperty(constraints, CONSTRAINT_VIDEO_MIN_BITRATE, 0);
+    var maxBitrate = getConstraintsProperty(constraints, CONSTRAINT_VIDEO_MAX_BITRATE, 0);
 
     // Quality
-    var quality = getConstraintsProperty(constraints, "video.quality", 0);
+    var quality = getConstraintsProperty(constraints, CONSTRAINT_VIDEO_QUALITY, 0);
     if (quality > 100) quality = 100;
     // Play resolution
-    var playWidth = typeof options.playWidth !== 'undefined' ? options.playWidth : getConstraintsProperty(constraints, "video.width", 0);
-    var playHeight = typeof options.playHeight !== 'undefined' ? options.playHeight : getConstraintsProperty(constraints, "video.height", 0);
+    var playWidth = typeof options.playWidth !== 'undefined' ? options.playWidth : getConstraintsProperty(constraints, CONSTRAINT_VIDEO_WIDTH, 0);
+    var playHeight = typeof options.playHeight !== 'undefined' ? options.playHeight : getConstraintsProperty(constraints, CONSTRAINT_VIDEO_HEIGHT, 0);
     var stripCodecs = options.stripCodecs || [];
     var resolution = {};
     var published_ = false;
@@ -9254,6 +9276,8 @@ var createSession = function createSession(options) {
         var _sdp = sdp;
         if (_codecOptions) _sdp = util.SDP.writeFmtp(sdp, _codecOptions, "opus");
         _sdp = sdpHookHandler(_sdp, sdpHook);
+        // Adjust publishing bitrate #WCS-4013
+        _sdp = util.setPublishingBitrate(_sdp, mediaConnection, minBitrate, maxBitrate);
         mediaConnection.setRemoteSdp(_sdp).then(function () {});
         return;
       }
@@ -10530,6 +10554,62 @@ var SDP = {
       }
     }
     return result;
+  },
+  setPublishingBitrate: function setPublishingBitrate(sdp, minBitrate, maxBitrate) {
+    if (sdp && (minBitrate || maxBitrate)) {
+      var sdpArray = sdp.split("\n");
+      var i;
+      var rtpmap = -1,
+        codec = "";
+      var matches;
+      var bitrateString = "";
+      for (i = 0; i < sdpArray.length; i++) {
+        if (sdpArray[i].startsWith("a=rtpmap")) {
+          matches = sdpArray[i].match("a=rtpmap:(.+) (.+)/.*");
+          if (matches && matches.length > 2) {
+            rtpmap = parseInt(matches[1], 10);
+            codec = matches[2];
+          }
+        } else {
+          if (codec === "H264" || codec === "VP8") {
+            if (sdpArray[i].startsWith("a=fmtp:" + rtpmap)) {
+              bitrateString = this.getBitrateString(sdpArray[i], minBitrate, maxBitrate);
+              if (bitrateString) {
+                sdpArray[i] += ";" + bitrateString;
+              }
+            } else {
+              bitrateString = this.getBitrateString("", minBitrate, maxBitrate);
+              if (bitrateString) {
+                sdpArray[i] = "a=fmtp:" + rtpmap + " " + bitrateString + "\r\n" + sdpArray[i];
+              }
+            }
+            codec = "";
+            rtpmap = -1;
+          }
+        }
+      }
+      var newSDP = "";
+      for (i = 0; i < sdpArray.length; i++) {
+        if (sdpArray[i] != "") {
+          newSDP += sdpArray[i] + "\n";
+        }
+      }
+      return newSDP;
+    }
+    return sdp;
+  },
+  getBitrateString: function getBitrateString(string, minBitrate, maxBitrate) {
+    var bitrateString = "";
+    if (minBitrate && string.indexOf("x-google-min-bitrate") == -1) {
+      bitrateString += "x-google-min-bitrate=" + minBitrate;
+    }
+    if (maxBitrate && string.indexOf("x-google-max-bitrate") == -1) {
+      if (bitrateString) {
+        bitrateString += ";";
+      }
+      bitrateString += "x-google-max-bitrate=" + maxBitrate;
+    }
+    return bitrateString;
   }
 };
 var logger = function logger() {
@@ -10773,6 +10853,18 @@ var isPromise = function isPromise(object) {
   }
   return false;
 };
+var setPublishingBitrate = function setPublishingBitrate(sdp, mediaConnection, minBitrate, maxBitrate) {
+  if (minBitrate || maxBitrate) {
+    if (sdp && Browser.isChrome() || Browser.isSafariWebRTC()) {
+      // Set publishing bitrate constraints via remote SDP
+      sdp = SDP.setPublishingBitrate(sdp, minBitrate, maxBitrate);
+    } else if (mediaConnection) {
+      // Set publishing bitrate via sender encodings if SDP feature is not supported
+      mediaConnection.setPublishingBitrate(minBitrate, maxBitrate);
+    }
+  }
+  return sdp;
+};
 module.exports = {
   isEmptyObject: isEmptyObject,
   copyObjectToArray: copyObjectToArray,
@@ -10783,7 +10875,8 @@ module.exports = {
   logger: logger,
   stripCodecs: stripCodecs,
   getCurrentCodecAndSampleRate: getCurrentCodecAndSampleRate,
-  isPromise: isPromise
+  isPromise: isPromise,
+  setPublishingBitrate: setPublishingBitrate
 };
 
 },{}],42:[function(require,module,exports){
@@ -10859,7 +10952,7 @@ var createConnection = function createConnection(options) {
         if (localVideo.srcObject) {
           localVideo.id = id + "-local";
           setContentHint(localVideo.srcObject, videoContentHint);
-          connection.addStream(localVideo.srcObject);
+          addStreamTracks(connection, localVideo.srcObject);
         } else {
           localVideo = null;
         }
@@ -10902,7 +10995,7 @@ var createConnection = function createConnection(options) {
           localVideo = cachedVideo;
           localVideo.id = id;
           setContentHint(localVideo.srcObject, videoContentHint);
-          connection.addStream(localVideo.srcObject);
+          addStreamTracks(connection, localVideo.srcObject);
         }
       } else {
         // There is a custom video element, get its id if set #WCS-3606
@@ -10949,6 +11042,11 @@ var createConnection = function createConnection(options) {
         }
       });
     }
+    function addStreamTracks(pc, stream) {
+      stream.getTracks().forEach(function (track) {
+        pc.addTrack(track, stream);
+      });
+    }
     connection.ontrack = function (event) {
       if (remoteVideo) {
         remoteVideo.srcObject = event.streams[0];
@@ -11542,6 +11640,20 @@ var createConnection = function createConnection(options) {
       logger.info(LOG_PREFIX, "Switch to cam");
       screenShare = false;
     };
+    var setPublishingBitrate = function setPublishingBitrate(minBitrate, maxBitrate) {
+      var senders = connection.getSenders();
+      senders.forEach(function (sender) {
+        if (sender.track.kind == "video" && maxBitrate) {
+          var parameters = sender.getParameters();
+          for (var i = 0; i < parameters.encodings.length; i++) {
+            if (!parameters.encodings[i].maxBitrate) {
+              parameters.encodings[i].maxBitrate = maxBitrate * 1000;
+            }
+          }
+          sender.setParameters(parameters).then(function () {});
+        }
+      });
+    };
     var exports = {};
     exports.state = state;
     exports.createOffer = createOffer;
@@ -11568,6 +11680,7 @@ var createConnection = function createConnection(options) {
     exports.switchMic = switchMic;
     exports.switchToScreen = switchToScreen;
     exports.switchToCam = switchToCam;
+    exports.setPublishingBitrate = setPublishingBitrate;
     connections[id] = exports;
     resolve(exports);
   });