@flashphoner/websdk 2.0.245 → 2.0.247

package/src/webrtc-media-provider.js

@@ -19,6 +19,8 @@ var validBrowsers = ["firefox", "chrome", "safari"];
 var videoCams = [];
 // list of presented audio input devices
 var mics = [];
+// current audio source device label
+let audioSourceDevice = "";
 
 var createConnection = function (options) {
     return new Promise(function (resolve, reject) {
@@ -461,18 +463,25 @@ var createConnection = function (options) {
                             stat.forEach(function (report) {
                                 if (!report.isRemote) {
                                     let mediaType = "";
-                                    if (report.type == 'outbound-rtp') {
+                                    if (report.type === 'outbound-rtp') {
                                         mediaType = getReportMediaType(report);
                                         fillStatObject(result.outboundStream, report, mediaType);
-                                        if (mediaType == 'video') {
+                                        if (mediaType === 'video') {
                                             getVideoSize(result.outboundStream[mediaType], report);
                                         }
-                                    } else if (report.type == 'inbound-rtp') {
+                                    } else if (report.type === 'inbound-rtp') {
                                         mediaType = getReportMediaType(report);
                                         fillStatObject(result.inboundStream, report, mediaType);
-                                        if (mediaType == 'video') {
+                                        if (mediaType === 'video') {
                                             getVideoSize(result.inboundStream[mediaType], report);
                                         }
+                                    } else if (report.type === 'candidate-pair' && report.state === 'succeeded' && report.nominated) {
+                                        if (report.availableIncomingBitrate) {
+                                            result.otherStats.availableIncomingBitrate = report.availableIncomingBitrate;
+                                        } else if (localVideo && report.availableOutgoingBitrate) {
+                                            // availableOutgoingBitrate is defined for incoming stream too #WCS-4175
+                                            result.otherStats.availableOutgoingBitrate = report.availableOutgoingBitrate;
+                                        }
                                     }
                                 }
                             });
@@ -530,19 +539,27 @@ var createConnection = function (options) {
             } else {
                logger.debug(LOG_PREFIX, "Can't parse current SDP to detect codec and sampleRate");
             }
-            var codec = util.getCurrentCodecAndSampleRate(sdp, mediaType);
+            let codec = util.getCurrentCodecAndSampleRate(sdp, mediaType);
             obj[mediaType]["codec"] = codec.name;
             obj[mediaType]["codecRate"] = codec.sampleRate;
+            let qualityLimitationDurations;
             Object.keys(report).forEach(function (key) {
                 // Add audioLevel parameter parsing #WCS-3290
                 if (key.startsWith("bytes") ||
                     key.startsWith("packets") ||
                     key.indexOf("Count") != -1 ||
                     key.indexOf("audioLevel") != -1 ||
-                    key == "framesPerSecond") {
+                    key === "framesPerSecond" ||
+                    key === "qualityLimitationReason" ) {
                     obj[mediaType][key] = report[key];
                 }
+                if (key === "qualityLimitationDurations") {
+                    qualityLimitationDurations = report[key];
+                }
             });
+            if (qualityLimitationDurations) {
+                obj[mediaType]["qualityLimitationDurations"] = qualityLimitationDurations[obj[mediaType]["qualityLimitationReason"]];
+            }
         };
 
         var fullScreen = function () {
@@ -955,10 +972,14 @@ var getMediaAccess = function (constraints, display, disableConstraintsNormaliza
                 // WCS-2933, fix mobile streaming issues, gather info about available devices before streaming, but not during
                 listDevices(false).then((devices) => {
                     devices.video.forEach(function (device) {
-                        videoCams.push(device);
+                        if (!videoCams.find((cam) => device.id === cam.id)) {
+                            videoCams.push(device);
+                        }
                     })
                     devices.audio.forEach(function (device) {
-                        mics.push(device);
+                        if (!mics.find((mic) => device.id === mic.id)) {
+                            mics.push(device);
+                        }
                     })
                     navigator.getUserMedia(constraints, function (stream) {
                         loadVideo(display, stream, screenShare, requestAudioConstraints, resolve, constraints, useCanvas);
@@ -1188,6 +1209,7 @@ var createGainNode = function (stream) {
     source.connect(gainNode);
     gainNode.connect(destination);
     var sourceAudioTrack = stream.getAudioTracks()[0];
+    audioSourceDevice = sourceAudioTrack.label;
     gainNode.sourceAudioTrack = sourceAudioTrack;
     gainNode.release = function () {
         this.sourceAudioTrack.stop();
@@ -1198,6 +1220,10 @@ var createGainNode = function (stream) {
     return gainNode;
 };
 
+const getAudioSourceDevice = function () {
+    return audioSourceDevice;
+}
+
 //Fix to set screen resolution for screen sharing in Firefox
 var setScreenResolution = function (video, stream, constraints) {
     var newHeight;
@@ -1314,6 +1340,22 @@ function getCacheInstance(display) {
     }
 }
 
+function getVideoElement(display) {
+    if (display) {
+        for (const child of display.children) {
+            if (child.tagName.toLowerCase() === "video") {
+                return child;
+            } else {
+                let grandchild = getVideoElement(child);
+                if (grandchild) {
+                    return grandchild;
+                }
+            }
+        }
+    }
+    return null;
+}
+
 function createVideoElement(useControls = false) {
     let video = document.createElement('video');
     // Prepare video tag to auto play and add specific Safari tweaks #WCS-2425
@@ -1440,8 +1482,8 @@ var listDevices = function (labels, kind, deviceConstraints) {
                     return;
                 }
                 navigator.getUserMedia(constraints, function (stream) {
-                    navigator.mediaDevices.enumerateDevices().then(function (devicesWithLabales) {
-                        resolve(getList(devicesWithLabales));
+                    navigator.mediaDevices.enumerateDevices().then(function (devicesWithLabels) {
+                        resolve(getList(devicesWithLabels));
                         stream.getTracks().forEach(function (track) {
                             track.stop();
                         });
@@ -1581,5 +1623,10 @@ module.exports = {
         logger = configuration.logger;
         createMicGainNode = (typeof configuration.createMicGainNode !== 'undefined') ? configuration.createMicGainNode : true;
         logger.info(LOG_PREFIX, "Initialized");
-    }
+    },
+    videoCams: videoCams,
+    mics: mics,
+    getAudioSourceDevice: getAudioSourceDevice,
+    getCacheInstance: getCacheInstance,
+    getVideoElement: getVideoElement
 };