@flashphoner/websdk 2.0.247 → 2.0.248

package/flashphoner-webrtc-only.js

@@ -6933,7 +6933,7 @@ function getClientInfo(_x, _x2) {
   return _getClientInfo.apply(this, arguments);
 }
 function _getClientInfo() {
-  _getClientInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(navigator, keys) {
+  _getClientInfo = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(navigator, keys) {
     var info, customUAData;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -7900,7 +7900,7 @@ var disableConnectionQualityCalculation;
  * @memberof Flashphoner
  */
 var init = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
     var waitingTemasys, audioContext, webRtcProvider, enableGainNode, webRtcConf, flashProvider, flashConf, mediaSourceMediaProvider, mseConf, websocketProvider, wsConf, _MediaProvider, p, newMediaProvider, i, pMP;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -10052,7 +10052,7 @@ var createSession = function createSession(options) {
      * @memberof Stream
      * @inner
      */
-    var stop = function stop() {
+    var _stop = function stop() {
       logger.debug(LOG_PREFIX, "Stop stream " + name_);
       if (status_ == STREAM_STATUS.NEW) {
         //trigger FAILED status
@@ -10062,7 +10062,7 @@ var createSession = function createSession(options) {
         return;
       } else if (status_ == STREAM_STATUS.PENDING) {
         logger.warn(LOG_PREFIX, "Stopping stream before server response " + id_);
-        setTimeout(stop, 200);
+        setTimeout(_stop, 200);
         return;
       } else if (status_ == STREAM_STATUS.FAILED) {
         logger.warn(LOG_PREFIX, "Stream status FAILED");
@@ -10473,7 +10473,7 @@ var createSession = function createSession(options) {
     };
     stream.play = play;
     stream.publish = publish;
-    stream.stop = stop;
+    stream.stop = _stop;
     stream.id = id;
     stream.status = status;
     stream.name = name;
@@ -11365,7 +11365,7 @@ var createConnection = function createConnection(options) {
     var localVideo;
     //tweak for custom video players #WCS-1511
     var remoteVideo = options.remoteVideo;
-    var switchCamCount = 0;
+    var switchCamIndex = 0;
     var switchMicCount = 0;
     var customStream = options.customStream;
     var currentAudioTrack;
@@ -11451,7 +11451,7 @@ var createConnection = function createConnection(options) {
       if (videoTrack) {
         videoCams.forEach(function (cam, index) {
           if (videoTrack.label === cam.label) {
-            switchCamCount = index;
+            switchCamIndex = index;
           }
         });
       }
@@ -11912,13 +11912,27 @@ var createConnection = function createConnection(options) {
         if (localVideo && localVideo.srcObject && videoCams.length > 1 && !customStream && !screenShare) {
           connection.getSenders().forEach(function (sender) {
             if (sender.track.kind === 'audio') return;
-            switchCamCount = (switchCamCount + 1) % videoCams.length;
             sender.track.stop();
-            var cam = typeof deviceId !== "undefined" ? deviceId : videoCams[switchCamCount].id;
+            var cameraId;
+            if (typeof deviceId !== "undefined") {
+              videoCams.forEach(function (cam, index) {
+                if (deviceId === cam.id) {
+                  switchCamIndex = index;
+                }
+              });
+              cameraId = deviceId;
+            } else {
+              switchCamIndex = (switchCamIndex + 1) % videoCams.length;
+              cameraId = videoCams[switchCamIndex].id;
+            }
+            if (!cameraId) {
+              logger.error(LOG_PREFIX, "Can't detect camera to switch to");
+              reject(constants.ERROR_INFO.CAN_NOT_SWITCH_CAM);
+            }
             //use the settings that were set during connection initiation
             var clonedConstraints = Object.assign({}, constraints);
             clonedConstraints.video.deviceId = {
-              exact: cam
+              exact: cameraId
             };
             clonedConstraints.audio = false;
             navigator.mediaDevices.getUserMedia(clonedConstraints).then(function (newStream) {
@@ -11931,8 +11945,8 @@ var createConnection = function createConnection(options) {
               if (localVideo.srcObject.getAudioTracks().length == 0 && audioTrack) {
                 localVideo.srcObject.addTrack(audioTrack);
               }
-              logger.info(LOG_PREFIX, "Switch camera to " + cam);
-              resolve(cam);
+              logger.info(LOG_PREFIX, "Switch camera to " + cameraId);
+              resolve(cameraId);
             })["catch"](function (reason) {
               logger.error(LOG_PREFIX, reason);
               reject(reason);