@wireapp/avs 10.0.5 → 10.0.7

package/dist/avs_pc.js

@@ -182,26 +182,34 @@ function replace_track(pc, newTrack) {
     var senders = rtc.getSenders();
     if (!senders)
         return false;
-    for (var _i = 0, senders_1 = senders; _i < senders_1.length; _i++) {
-        var sender = senders_1[_i];
+    var _loop_1 = function (sender) {
         if (!sender)
-            continue;
+            return "continue";
         if (!sender.track)
-            continue;
+            return "continue";
         if (sender.track.kind === newTrack.kind) {
             var oldTrack = sender.track;
             if (!oldTrack) {
                 pc_log(LOG_LEVEL_INFO, 'replace_track: oldtrack null');
             }
             else {
-                var enabled = oldTrack.enabled;
-                newTrack.enabled = enabled;
-                sender.replaceTrack(newTrack);
-                sender.track.enabled = enabled;
-                pc_log(LOG_LEVEL_INFO, "replace_track: kind=".concat(newTrack.kind, " enabled=").concat(sender.track.enabled));
-                return true;
+                var enabled_1 = oldTrack.enabled;
+                // newTrack.enabled = enabled;
+                sender.replaceTrack(newTrack).then(function () {
+                    if (!!sender && !!sender.track) {
+                        sender.track.enabled = enabled_1;
+                        pc_log(LOG_LEVEL_INFO, "replace_track: kind=".concat(newTrack.kind, " enabled=").concat(sender.track.enabled));
+                    }
+                });
+                return { value: true };
             }
         }
+    };
+    for (var _i = 0, senders_1 = senders; _i < senders_1.length; _i++) {
+        var sender = senders_1[_i];
+        var state_1 = _loop_1(sender);
+        if (typeof state_1 === "object")
+            return state_1.value;
     }
     return false;
 }
@@ -255,43 +263,24 @@ function update_tracks(pc, stream) {
             pc_log(LOG_LEVEL_INFO, "update_tracks: adding track of kind=".concat(track.kind, ", id=").concat(track.id));
             if (track.kind === 'video' && pc.conv_type !== CONV_TYPE_ONEONONE) {
                 var transceivers = rtc.getTransceivers();
-                var _loop_1 = function (trans) {
-                    if (trans.mid === 'video') {
+                var _loop_2 = function (trans) {
+                    if (trans.mid === 'video' && !!trans.sender) {
                         pc_log(LOG_LEVEL_INFO, "update_tracks: adjust");
-                        var params = trans.sender.getParameters();
-                        if (!params.encodings) {
-                            pc_log(LOG_LEVEL_INFO, "update_tracks: no params");
-                            params.encodings = [];
-                        }
-                        var layerFound_1 = false;
-                        params.encodings.forEach(function (coding) {
-                            if (coding.rid === 'l') {
-                                //@ts-ignore
-                                coding.scalabilityMode = 'L1T1';
-                                coding.scaleResolutionDownBy = 4;
-                                coding.active = true;
-                                layerFound_1 = true;
-                            }
-                            if (coding.rid === 'h') {
-                                //@ts-ignore
-                                coding.scalabilityMode = 'L1T1';
-                                coding.scaleResolutionDownBy = 1;
-                                coding.active = true;
-                                layerFound_1 = true;
-                            }
-                        });
+                        var _a = getEncodingParameter(trans.sender, pc.vstate === PC_VIDEO_STATE_SCREENSHARE), params_1 = _a.params, layerFound = _a.layerFound;
+                        pc_log(LOG_LEVEL_INFO, 'add track: ' + layerFound);
                         rtc.addTrack(track, stream);
-                        if (layerFound_1) {
-                            videoSenderUpdates.push(trans.sender.setParameters(params).catch(function (e) { return pc_log(LOG_LEVEL_ERROR, "update_tracks: set params ".concat(e)); })
-                                // Reinsert the track so that the changes are transferred to the track (needed for FF)
-                                .then(function () { return trans.sender.replaceTrack(track); })
+                        if (layerFound) {
+                            videoSenderUpdates.push(trans.sender.setParameters(params_1).catch(function (e) { return pc_log(LOG_LEVEL_ERROR, "update_tracks: set params ".concat(e)); })
+                                .then(function () {
+                                pc_log(LOG_LEVEL_INFO, 'setParameters: ' + JSON.stringify(params_1));
+                            })
                                 .then());
                         }
                     }
                 };
                 for (var _i = 0, transceivers_1 = transceivers; _i < transceivers_1.length; _i++) {
                     var trans = transceivers_1[_i];
-                    _loop_1(trans);
+                    _loop_2(trans);
                 }
             }
             else {
@@ -309,6 +298,41 @@ function update_tracks(pc, stream) {
         pc_log(LOG_LEVEL_ERROR, "update_tracks: error=".concat(e));
     }).then();
 }
+function getEncodingParameter(sender, isScreenShare) {
+    pc_log(LOG_LEVEL_INFO, "update_tracks: adjust");
+    var params = sender.getParameters();
+    if (!params.encodings) {
+        pc_log(LOG_LEVEL_INFO, "update_tracks: no params");
+        params.encodings = [];
+    }
+    var layerFound = false;
+    params.encodings.forEach(function (coding) {
+        if (coding.rid === 'l') {
+            if (pc_env !== ENV_FIREFOX) {
+                //@ts-ignore
+                coding.scalabilityMode = 'L1T1';
+            }
+            if (pc_env === ENV_FIREFOX && isScreenShare) {
+                coding.active = false;
+            }
+            else {
+                coding.active = true;
+            }
+            coding.scaleResolutionDownBy = 4;
+            layerFound = true;
+        }
+        if (coding.rid === 'h') {
+            if (pc_env !== ENV_FIREFOX) {
+                //@ts-ignore
+                coding.scalabilityMode = 'L1T1';
+            }
+            coding.scaleResolutionDownBy = 1;
+            coding.active = true;
+            layerFound = true;
+        }
+    });
+    return { params: params, layerFound: layerFound };
+}
 function sigState(stateStr) {
     var state = PC_SIG_STATE_UNKNOWN;
     switch (stateStr) {
@@ -768,6 +792,36 @@ function sdpCbrMap(sdp) {
                 outline = null;
             }
         }
+        // reorder rids for firefox
+        else if (sdpLine.startsWith('a=simulcast:recv l;h') && pc_env === ENV_FIREFOX) {
+            outline = 'a=simulcast:recv h;l';
+        }
+        else if (sdpLine.startsWith('a=rid:l recv') && pc_env === ENV_FIREFOX) {
+            outline = 'a=rid:h recv';
+        }
+        else if (sdpLine.startsWith('a=rid:h recv') && pc_env === ENV_FIREFOX) {
+            outline = 'a=rid:l recv';
+        }
+        if (outline != null) {
+            sdpLines.push(outline);
+        }
+    });
+    return sdpLines.join('\r\n');
+}
+function sdpRidReOrder(sdp) {
+    var sdpLines = [];
+    sdp.split('\r\n').forEach(function (sdpLine) {
+        var outline;
+        outline = sdpLine;
+        if (sdpLine.startsWith('a=simulcast:send h;l') && pc_env === ENV_FIREFOX) {
+            outline = 'a=simulcast:send l;h';
+        }
+        else if (sdpLine.startsWith('a=rid:h send') && pc_env === ENV_FIREFOX) {
+            outline = 'a=rid:l send';
+        }
+        else if (sdpLine.startsWith('a=rid:l send') && pc_env === ENV_FIREFOX) {
+            outline = 'a=rid:h send';
+        }
         if (outline != null) {
             sdpLines.push(outline);
         }
@@ -1099,6 +1153,11 @@ function pc_LocalDescription(hnd, typePtr) {
         sdpStr = sdp.replace(' UDP/DTLS/SCTP', ' DTLS/SCTP');
         sdpStr = sdpMap(sdpStr, true, false);
     }
+    /* Ensure that we force CBR on the offer */
+    if (pc_env === ENV_FIREFOX && pc.conv_type == CONV_TYPE_CONFERENCE) {
+        sdpStr = sdpRidReOrder(sdpStr);
+    }
+    pc_log(LOG_LEVEL_INFO, "pc_LocalDescription: hnd=".concat(sdpStr));
     var sdpLen = em_module.lengthBytesUTF8(sdpStr) + 1; // +1 for '\0'
     var ptr = em_module._malloc(sdpLen);
     em_module.stringToUTF8(sdpStr, ptr, sdpLen);
@@ -1331,14 +1390,14 @@ function pc_ReplaceTrack(convid, newTrack) {
 function pc_GetStats(convid) {
     var pcs = connectionsStore.getPeerConnectionByConvid(convid);
     var statsPromises = [];
-    var _loop_2 = function (pc) {
+    var _loop_3 = function (pc) {
         var rtc = pc.rtc;
         if (rtc)
             statsPromises.push(rtc.getStats().then(function (stats) { return ({ userid: pc.remote_userid, stats: stats }); }));
     };
     for (var _i = 0, pcs_2 = pcs; _i < pcs_2.length; _i++) {
         var pc = pcs_2[_i];
-        _loop_2(pc);
+        _loop_3(pc);
     }
     return Promise.all(statsPromises);
 }

package/package.json

@@ -21,5 +21,5 @@
     "prepack": "prettier -w src/avs_wcall.ts && tsc && cp src/*.js src/*.d.ts dist/",
     "test": "karma start"
   },
-  "version": "10.0.5"
+  "version": "10.0.7"
 }