@whereby.com/media 1.6.0 → 1.6.1

package/dist/index.cjs

@@ -3072,22 +3072,15 @@ class Session {
         return this.pc && this.pc.connectionState === "connected";
     }
     replaceTrack(oldTrack, newTrack) {
+        if (!newTrack) {
+            rtcStats.sendEvent("replaceTrackP2P", { nullTrack: "newTrack", oldTrackKind: oldTrack === null || oldTrack === void 0 ? void 0 : oldTrack.kind });
+        }
         const pc = this.pc;
         if (!pc)
             return false;
         const senders = pc.getSenders();
-        function dbg(msg) {
-            const tr = (t) => t && `id:${t.id},kind:${t.kind},state:${t.readyState}`;
-            logger$5.warn(`${msg}. newTrack:${tr(newTrack)}, oldTrack:${tr(oldTrack)}, sender tracks: ${JSON.stringify(senders.map((s) => `s ${tr(s.track)}`))}, sender first codecs: ${JSON.stringify(senders.map((s) => (s.getParameters().codecs || [])[0]))}`);
-        }
-        if (!senders.length) {
-            dbg("No senders!");
-        }
         if (!oldTrack) {
             oldTrack = (senders.find((s) => s.track && s.track.kind === newTrack.kind) || {}).track;
-            if (!oldTrack) {
-                dbg("No sender with same kind! Add new track then.");
-            }
         }
         if (window.RTCRtpSender && window.RTCRtpSender.prototype.replaceTrack) {
             if (oldTrack) {
@@ -3095,8 +3088,8 @@ class Session {
                     for (let i = 0; i < senders.length; i++) {
                         const sender = senders[i];
                         const track = sender.track;
-                        if (!sender && !track) {
-                            dbg("One of the tracks is null!");
+                        if (!track) {
+                            rtcStats.sendEvent("replaceTrackP2P", { nullTrack: "trackFromSender", oldTrackKind: oldTrack === null || oldTrack === void 0 ? void 0 : oldTrack.kind, newTrackKind: newTrack === null || newTrack === void 0 ? void 0 : newTrack.kind });
                         }
                         if (track.id === newTrack.id) {
                             return Promise.resolve(newTrack);
@@ -3124,7 +3117,6 @@ class Session {
                         if (3 < ++retried) {
                             clearInterval(timer);
                             timer = null;
-                            dbg("No sender track to replace");
                             reject("No sender track to replace");
                         }
                         return;
@@ -3138,7 +3130,6 @@ class Session {
             }
             const stream = this.streams.find((s) => s.getTracks().find((t) => t.id === newTrack.id)) || this.streams[0];
             if (!stream) {
-                dbg("No stream?");
                 return Promise.reject(new Error("replaceTrack: No stream?"));
             }
             return pc.addTrack(newTrack, stream);
@@ -4732,21 +4723,6 @@ function createMicAnalyser({ micTrack, params, onScoreUpdated, }) {
     };
 }
 
-const maybeTurnOnly = (transportConfig, features) => {
-    if (!features.useOnlyTURN) {
-        return;
-    }
-    transportConfig.iceTransportPolicy = "relay";
-    const filter = {
-        onlyudp: /^turn:.*transport=udp$/,
-        onlytcp: /^turn:.*transport=tcp$/,
-        onlytls: /^turns:.*transport=tcp$/,
-    }[features.useOnlyTURN];
-    if (filter) {
-        transportConfig.iceServers = transportConfig.iceServers.filter((entry) => entry.url && entry.url.match(filter));
-    }
-};
-
 const logger$2 = new Logger();
 const MEDIA_QUALITY = Object.freeze({
     ok: "ok",
@@ -4901,6 +4877,56 @@ class VegaMediaQualityMonitor extends EventEmitter {
     }
 }
 
+const maybeTurnOnly = (transportConfig, features) => {
+    if (!features.useOnlyTURN) {
+        return;
+    }
+    transportConfig.iceTransportPolicy = "relay";
+    const filter = {
+        onlyudp: /^turn:.*transport=udp$/,
+        onlytcp: /^turn:.*transport=tcp$/,
+        onlytls: /^turns:.*transport=tcp$/,
+    }[features.useOnlyTURN];
+    if (filter) {
+        transportConfig.iceServers = transportConfig.iceServers.filter((entry) => entry.url && entry.url.match(filter));
+    }
+};
+
+function getLayers({ width, height, }, { numberOfActiveVideos, numberOfTemporalLayers, uncappedSingleRemoteVideoOn, }) {
+    const maxSide = Math.max(width, height);
+    let spatialLayer = maxSide >= 480 ? (maxSide >= 960 ? 2 : 1) : 0;
+    let temporalLayer = numberOfTemporalLayers - 1;
+    if (maxSide < 100) {
+        temporalLayer = Math.max(numberOfTemporalLayers - 2, 0);
+    }
+    if (numberOfActiveVideos > 8 && spatialLayer === 0) {
+        temporalLayer = Math.max(numberOfTemporalLayers - 2, 0);
+    }
+    if (numberOfActiveVideos < 4 && maxSide > 300 && spatialLayer === 0) {
+        spatialLayer = 1;
+    }
+    if (uncappedSingleRemoteVideoOn && numberOfActiveVideos === 1) {
+        spatialLayer = 2;
+        temporalLayer = numberOfTemporalLayers - 1;
+    }
+    return { spatialLayer, temporalLayer };
+}
+function getNumberOfActiveVideos(consumers) {
+    let numberOfActiveVideos = 0;
+    consumers.forEach((c) => {
+        var _a, _b;
+        if (c._closed || c._paused)
+            return;
+        if (((_a = c._appData) === null || _a === void 0 ? void 0 : _a.source) === "webcam" || ((_b = c._appData) === null || _b === void 0 ? void 0 : _b.source) === "screenvideo")
+            numberOfActiveVideos++;
+    });
+    return numberOfActiveVideos;
+}
+function getNumberOfTemporalLayers(consumer) {
+    var _a, _b, _c;
+    return /T3/.test(((_c = (_b = (_a = consumer._rtpParameters) === null || _a === void 0 ? void 0 : _a.encodings) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.scalabilityMode) || "") ? 3 : 2;
+}
+
 var _a$1;
 const adapter$1 = (_a$1 = adapterRaw.default) !== null && _a$1 !== void 0 ? _a$1 : adapterRaw;
 const logger$1 = new Logger();
@@ -5827,43 +5853,23 @@ class VegaRtcManager {
         this._syncIncomingStreamsWithPWA(clientId);
     }
     updateStreamResolution(streamId, _ignored, { width, height, }) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b;
         logger$1.info("updateStreamResolution()", { streamId, width, height });
         const consumerId = this._streamIdToVideoConsumerId.get(streamId);
         const consumer = this._consumers.get(consumerId);
         if (!consumer)
             return;
-        let numberOfActiveVideos = 0;
-        this._consumers.forEach((c) => {
-            var _a, _b;
-            if (c._closed || c._paused)
-                return;
-            if (((_a = c._appData) === null || _a === void 0 ? void 0 : _a.source) === "webcam" || ((_b = c._appData) === null || _b === void 0 ? void 0 : _b.source) === "screenvideo")
-                numberOfActiveVideos++;
+        const numberOfActiveVideos = getNumberOfActiveVideos(this._consumers);
+        const numberOfTemporalLayers = getNumberOfTemporalLayers(consumer);
+        const { spatialLayer, temporalLayer } = getLayers({ width, height }, {
+            numberOfActiveVideos,
+            numberOfTemporalLayers,
+            uncappedSingleRemoteVideoOn: (_a = this._features) === null || _a === void 0 ? void 0 : _a.uncappedSingleRemoteVideoOn,
         });
-        let numberOfTemporalLayers = 2;
-        if (/T3/.test(((_c = (_b = (_a = consumer._rtpParameters) === null || _a === void 0 ? void 0 : _a.encodings) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.scalabilityMode) || ""))
-            numberOfTemporalLayers = 3;
-        const maxSide = Math.max(width, height);
-        let spatialLayer = maxSide >= 480 ? (maxSide >= 960 ? 2 : 1) : 0;
-        let temporalLayer = numberOfTemporalLayers - 1;
-        if (maxSide < 100) {
-            temporalLayer = Math.max(numberOfTemporalLayers - 2, 0);
-        }
-        if (numberOfActiveVideos > 8 && spatialLayer === 0) {
-            temporalLayer = Math.max(numberOfTemporalLayers - 2, 0);
-        }
-        if (numberOfActiveVideos < 4 && maxSide > 300 && spatialLayer === 0) {
-            spatialLayer = 1;
-        }
-        if (((_d = this._features) === null || _d === void 0 ? void 0 : _d.uncappedSingleRemoteVideoOn) && numberOfActiveVideos === 1) {
-            spatialLayer = 2;
-            temporalLayer = numberOfTemporalLayers - 1;
-        }
         if (consumer.appData.spatialLayer !== spatialLayer || consumer.appData.temporalLayer !== temporalLayer) {
             consumer.appData.spatialLayer = spatialLayer;
             consumer.appData.temporalLayer = temporalLayer;
-            (_e = this._vegaConnection) === null || _e === void 0 ? void 0 : _e.message("setConsumersPreferredLayers", {
+            (_b = this._vegaConnection) === null || _b === void 0 ? void 0 : _b.message("setConsumersPreferredLayers", {
                 consumerIds: [consumerId],
                 spatialLayer,
                 temporalLayer,

package/dist/index.mjs

@@ -3051,22 +3051,15 @@ class Session {
         return this.pc && this.pc.connectionState === "connected";
     }
     replaceTrack(oldTrack, newTrack) {
+        if (!newTrack) {
+            rtcStats.sendEvent("replaceTrackP2P", { nullTrack: "newTrack", oldTrackKind: oldTrack === null || oldTrack === void 0 ? void 0 : oldTrack.kind });
+        }
         const pc = this.pc;
         if (!pc)
             return false;
         const senders = pc.getSenders();
-        function dbg(msg) {
-            const tr = (t) => t && `id:${t.id},kind:${t.kind},state:${t.readyState}`;
-            logger$5.warn(`${msg}. newTrack:${tr(newTrack)}, oldTrack:${tr(oldTrack)}, sender tracks: ${JSON.stringify(senders.map((s) => `s ${tr(s.track)}`))}, sender first codecs: ${JSON.stringify(senders.map((s) => (s.getParameters().codecs || [])[0]))}`);
-        }
-        if (!senders.length) {
-            dbg("No senders!");
-        }
         if (!oldTrack) {
             oldTrack = (senders.find((s) => s.track && s.track.kind === newTrack.kind) || {}).track;
-            if (!oldTrack) {
-                dbg("No sender with same kind! Add new track then.");
-            }
         }
         if (window.RTCRtpSender && window.RTCRtpSender.prototype.replaceTrack) {
             if (oldTrack) {
@@ -3074,8 +3067,8 @@ class Session {
                     for (let i = 0; i < senders.length; i++) {
                         const sender = senders[i];
                         const track = sender.track;
-                        if (!sender && !track) {
-                            dbg("One of the tracks is null!");
+                        if (!track) {
+                            rtcStats.sendEvent("replaceTrackP2P", { nullTrack: "trackFromSender", oldTrackKind: oldTrack === null || oldTrack === void 0 ? void 0 : oldTrack.kind, newTrackKind: newTrack === null || newTrack === void 0 ? void 0 : newTrack.kind });
                         }
                         if (track.id === newTrack.id) {
                             return Promise.resolve(newTrack);
@@ -3103,7 +3096,6 @@ class Session {
                         if (3 < ++retried) {
                             clearInterval(timer);
                             timer = null;
-                            dbg("No sender track to replace");
                             reject("No sender track to replace");
                         }
                         return;
@@ -3117,7 +3109,6 @@ class Session {
             }
             const stream = this.streams.find((s) => s.getTracks().find((t) => t.id === newTrack.id)) || this.streams[0];
             if (!stream) {
-                dbg("No stream?");
                 return Promise.reject(new Error("replaceTrack: No stream?"));
             }
             return pc.addTrack(newTrack, stream);
@@ -4711,21 +4702,6 @@ function createMicAnalyser({ micTrack, params, onScoreUpdated, }) {
     };
 }
 
-const maybeTurnOnly = (transportConfig, features) => {
-    if (!features.useOnlyTURN) {
-        return;
-    }
-    transportConfig.iceTransportPolicy = "relay";
-    const filter = {
-        onlyudp: /^turn:.*transport=udp$/,
-        onlytcp: /^turn:.*transport=tcp$/,
-        onlytls: /^turns:.*transport=tcp$/,
-    }[features.useOnlyTURN];
-    if (filter) {
-        transportConfig.iceServers = transportConfig.iceServers.filter((entry) => entry.url && entry.url.match(filter));
-    }
-};
-
 const logger$2 = new Logger();
 const MEDIA_QUALITY = Object.freeze({
     ok: "ok",
@@ -4880,6 +4856,56 @@ class VegaMediaQualityMonitor extends EventEmitter$1 {
     }
 }
 
+const maybeTurnOnly = (transportConfig, features) => {
+    if (!features.useOnlyTURN) {
+        return;
+    }
+    transportConfig.iceTransportPolicy = "relay";
+    const filter = {
+        onlyudp: /^turn:.*transport=udp$/,
+        onlytcp: /^turn:.*transport=tcp$/,
+        onlytls: /^turns:.*transport=tcp$/,
+    }[features.useOnlyTURN];
+    if (filter) {
+        transportConfig.iceServers = transportConfig.iceServers.filter((entry) => entry.url && entry.url.match(filter));
+    }
+};
+
+function getLayers({ width, height, }, { numberOfActiveVideos, numberOfTemporalLayers, uncappedSingleRemoteVideoOn, }) {
+    const maxSide = Math.max(width, height);
+    let spatialLayer = maxSide >= 480 ? (maxSide >= 960 ? 2 : 1) : 0;
+    let temporalLayer = numberOfTemporalLayers - 1;
+    if (maxSide < 100) {
+        temporalLayer = Math.max(numberOfTemporalLayers - 2, 0);
+    }
+    if (numberOfActiveVideos > 8 && spatialLayer === 0) {
+        temporalLayer = Math.max(numberOfTemporalLayers - 2, 0);
+    }
+    if (numberOfActiveVideos < 4 && maxSide > 300 && spatialLayer === 0) {
+        spatialLayer = 1;
+    }
+    if (uncappedSingleRemoteVideoOn && numberOfActiveVideos === 1) {
+        spatialLayer = 2;
+        temporalLayer = numberOfTemporalLayers - 1;
+    }
+    return { spatialLayer, temporalLayer };
+}
+function getNumberOfActiveVideos(consumers) {
+    let numberOfActiveVideos = 0;
+    consumers.forEach((c) => {
+        var _a, _b;
+        if (c._closed || c._paused)
+            return;
+        if (((_a = c._appData) === null || _a === void 0 ? void 0 : _a.source) === "webcam" || ((_b = c._appData) === null || _b === void 0 ? void 0 : _b.source) === "screenvideo")
+            numberOfActiveVideos++;
+    });
+    return numberOfActiveVideos;
+}
+function getNumberOfTemporalLayers(consumer) {
+    var _a, _b, _c;
+    return /T3/.test(((_c = (_b = (_a = consumer._rtpParameters) === null || _a === void 0 ? void 0 : _a.encodings) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.scalabilityMode) || "") ? 3 : 2;
+}
+
 var _a$1;
 const adapter$1 = (_a$1 = adapterRaw.default) !== null && _a$1 !== void 0 ? _a$1 : adapterRaw;
 const logger$1 = new Logger();
@@ -5806,43 +5832,23 @@ class VegaRtcManager {
         this._syncIncomingStreamsWithPWA(clientId);
     }
     updateStreamResolution(streamId, _ignored, { width, height, }) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b;
         logger$1.info("updateStreamResolution()", { streamId, width, height });
         const consumerId = this._streamIdToVideoConsumerId.get(streamId);
         const consumer = this._consumers.get(consumerId);
         if (!consumer)
             return;
-        let numberOfActiveVideos = 0;
-        this._consumers.forEach((c) => {
-            var _a, _b;
-            if (c._closed || c._paused)
-                return;
-            if (((_a = c._appData) === null || _a === void 0 ? void 0 : _a.source) === "webcam" || ((_b = c._appData) === null || _b === void 0 ? void 0 : _b.source) === "screenvideo")
-                numberOfActiveVideos++;
+        const numberOfActiveVideos = getNumberOfActiveVideos(this._consumers);
+        const numberOfTemporalLayers = getNumberOfTemporalLayers(consumer);
+        const { spatialLayer, temporalLayer } = getLayers({ width, height }, {
+            numberOfActiveVideos,
+            numberOfTemporalLayers,
+            uncappedSingleRemoteVideoOn: (_a = this._features) === null || _a === void 0 ? void 0 : _a.uncappedSingleRemoteVideoOn,
         });
-        let numberOfTemporalLayers = 2;
-        if (/T3/.test(((_c = (_b = (_a = consumer._rtpParameters) === null || _a === void 0 ? void 0 : _a.encodings) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.scalabilityMode) || ""))
-            numberOfTemporalLayers = 3;
-        const maxSide = Math.max(width, height);
-        let spatialLayer = maxSide >= 480 ? (maxSide >= 960 ? 2 : 1) : 0;
-        let temporalLayer = numberOfTemporalLayers - 1;
-        if (maxSide < 100) {
-            temporalLayer = Math.max(numberOfTemporalLayers - 2, 0);
-        }
-        if (numberOfActiveVideos > 8 && spatialLayer === 0) {
-            temporalLayer = Math.max(numberOfTemporalLayers - 2, 0);
-        }
-        if (numberOfActiveVideos < 4 && maxSide > 300 && spatialLayer === 0) {
-            spatialLayer = 1;
-        }
-        if (((_d = this._features) === null || _d === void 0 ? void 0 : _d.uncappedSingleRemoteVideoOn) && numberOfActiveVideos === 1) {
-            spatialLayer = 2;
-            temporalLayer = numberOfTemporalLayers - 1;
-        }
         if (consumer.appData.spatialLayer !== spatialLayer || consumer.appData.temporalLayer !== temporalLayer) {
             consumer.appData.spatialLayer = spatialLayer;
             consumer.appData.temporalLayer = temporalLayer;
-            (_e = this._vegaConnection) === null || _e === void 0 ? void 0 : _e.message("setConsumersPreferredLayers", {
+            (_b = this._vegaConnection) === null || _b === void 0 ? void 0 : _b.message("setConsumersPreferredLayers", {
                 consumerIds: [consumerId],
                 spatialLayer,
                 temporalLayer,

package/dist/legacy-esm.js

@@ -3051,22 +3051,15 @@ class Session {
         return this.pc && this.pc.connectionState === "connected";
     }
     replaceTrack(oldTrack, newTrack) {
+        if (!newTrack) {
+            rtcStats.sendEvent("replaceTrackP2P", { nullTrack: "newTrack", oldTrackKind: oldTrack === null || oldTrack === void 0 ? void 0 : oldTrack.kind });
+        }
         const pc = this.pc;
         if (!pc)
             return false;
         const senders = pc.getSenders();
-        function dbg(msg) {
-            const tr = (t) => t && `id:${t.id},kind:${t.kind},state:${t.readyState}`;
-            logger$5.warn(`${msg}. newTrack:${tr(newTrack)}, oldTrack:${tr(oldTrack)}, sender tracks: ${JSON.stringify(senders.map((s) => `s ${tr(s.track)}`))}, sender first codecs: ${JSON.stringify(senders.map((s) => (s.getParameters().codecs || [])[0]))}`);
-        }
-        if (!senders.length) {
-            dbg("No senders!");
-        }
         if (!oldTrack) {
             oldTrack = (senders.find((s) => s.track && s.track.kind === newTrack.kind) || {}).track;
-            if (!oldTrack) {
-                dbg("No sender with same kind! Add new track then.");
-            }
         }
         if (window.RTCRtpSender && window.RTCRtpSender.prototype.replaceTrack) {
             if (oldTrack) {
@@ -3074,8 +3067,8 @@ class Session {
                     for (let i = 0; i < senders.length; i++) {
                         const sender = senders[i];
                         const track = sender.track;
-                        if (!sender && !track) {
-                            dbg("One of the tracks is null!");
+                        if (!track) {
+                            rtcStats.sendEvent("replaceTrackP2P", { nullTrack: "trackFromSender", oldTrackKind: oldTrack === null || oldTrack === void 0 ? void 0 : oldTrack.kind, newTrackKind: newTrack === null || newTrack === void 0 ? void 0 : newTrack.kind });
                         }
                         if (track.id === newTrack.id) {
                             return Promise.resolve(newTrack);
@@ -3103,7 +3096,6 @@ class Session {
                         if (3 < ++retried) {
                             clearInterval(timer);
                             timer = null;
-                            dbg("No sender track to replace");
                             reject("No sender track to replace");
                         }
                         return;
@@ -3117,7 +3109,6 @@ class Session {
             }
             const stream = this.streams.find((s) => s.getTracks().find((t) => t.id === newTrack.id)) || this.streams[0];
             if (!stream) {
-                dbg("No stream?");
                 return Promise.reject(new Error("replaceTrack: No stream?"));
             }
             return pc.addTrack(newTrack, stream);
@@ -4711,21 +4702,6 @@ function createMicAnalyser({ micTrack, params, onScoreUpdated, }) {
     };
 }
 
-const maybeTurnOnly = (transportConfig, features) => {
-    if (!features.useOnlyTURN) {
-        return;
-    }
-    transportConfig.iceTransportPolicy = "relay";
-    const filter = {
-        onlyudp: /^turn:.*transport=udp$/,
-        onlytcp: /^turn:.*transport=tcp$/,
-        onlytls: /^turns:.*transport=tcp$/,
-    }[features.useOnlyTURN];
-    if (filter) {
-        transportConfig.iceServers = transportConfig.iceServers.filter((entry) => entry.url && entry.url.match(filter));
-    }
-};
-
 const logger$2 = new Logger();
 const MEDIA_QUALITY = Object.freeze({
     ok: "ok",
@@ -4880,6 +4856,56 @@ class VegaMediaQualityMonitor extends EventEmitter$1 {
     }
 }
 
+const maybeTurnOnly = (transportConfig, features) => {
+    if (!features.useOnlyTURN) {
+        return;
+    }
+    transportConfig.iceTransportPolicy = "relay";
+    const filter = {
+        onlyudp: /^turn:.*transport=udp$/,
+        onlytcp: /^turn:.*transport=tcp$/,
+        onlytls: /^turns:.*transport=tcp$/,
+    }[features.useOnlyTURN];
+    if (filter) {
+        transportConfig.iceServers = transportConfig.iceServers.filter((entry) => entry.url && entry.url.match(filter));
+    }
+};
+
+function getLayers({ width, height, }, { numberOfActiveVideos, numberOfTemporalLayers, uncappedSingleRemoteVideoOn, }) {
+    const maxSide = Math.max(width, height);
+    let spatialLayer = maxSide >= 480 ? (maxSide >= 960 ? 2 : 1) : 0;
+    let temporalLayer = numberOfTemporalLayers - 1;
+    if (maxSide < 100) {
+        temporalLayer = Math.max(numberOfTemporalLayers - 2, 0);
+    }
+    if (numberOfActiveVideos > 8 && spatialLayer === 0) {
+        temporalLayer = Math.max(numberOfTemporalLayers - 2, 0);
+    }
+    if (numberOfActiveVideos < 4 && maxSide > 300 && spatialLayer === 0) {
+        spatialLayer = 1;
+    }
+    if (uncappedSingleRemoteVideoOn && numberOfActiveVideos === 1) {
+        spatialLayer = 2;
+        temporalLayer = numberOfTemporalLayers - 1;
+    }
+    return { spatialLayer, temporalLayer };
+}
+function getNumberOfActiveVideos(consumers) {
+    let numberOfActiveVideos = 0;
+    consumers.forEach((c) => {
+        var _a, _b;
+        if (c._closed || c._paused)
+            return;
+        if (((_a = c._appData) === null || _a === void 0 ? void 0 : _a.source) === "webcam" || ((_b = c._appData) === null || _b === void 0 ? void 0 : _b.source) === "screenvideo")
+            numberOfActiveVideos++;
+    });
+    return numberOfActiveVideos;
+}
+function getNumberOfTemporalLayers(consumer) {
+    var _a, _b, _c;
+    return /T3/.test(((_c = (_b = (_a = consumer._rtpParameters) === null || _a === void 0 ? void 0 : _a.encodings) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.scalabilityMode) || "") ? 3 : 2;
+}
+
 var _a$1;
 const adapter$1 = (_a$1 = adapterRaw.default) !== null && _a$1 !== void 0 ? _a$1 : adapterRaw;
 const logger$1 = new Logger();
@@ -5806,43 +5832,23 @@ class VegaRtcManager {
         this._syncIncomingStreamsWithPWA(clientId);
     }
     updateStreamResolution(streamId, _ignored, { width, height, }) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b;
         logger$1.info("updateStreamResolution()", { streamId, width, height });
         const consumerId = this._streamIdToVideoConsumerId.get(streamId);
         const consumer = this._consumers.get(consumerId);
         if (!consumer)
             return;
-        let numberOfActiveVideos = 0;
-        this._consumers.forEach((c) => {
-            var _a, _b;
-            if (c._closed || c._paused)
-                return;
-            if (((_a = c._appData) === null || _a === void 0 ? void 0 : _a.source) === "webcam" || ((_b = c._appData) === null || _b === void 0 ? void 0 : _b.source) === "screenvideo")
-                numberOfActiveVideos++;
+        const numberOfActiveVideos = getNumberOfActiveVideos(this._consumers);
+        const numberOfTemporalLayers = getNumberOfTemporalLayers(consumer);
+        const { spatialLayer, temporalLayer } = getLayers({ width, height }, {
+            numberOfActiveVideos,
+            numberOfTemporalLayers,
+            uncappedSingleRemoteVideoOn: (_a = this._features) === null || _a === void 0 ? void 0 : _a.uncappedSingleRemoteVideoOn,
         });
-        let numberOfTemporalLayers = 2;
-        if (/T3/.test(((_c = (_b = (_a = consumer._rtpParameters) === null || _a === void 0 ? void 0 : _a.encodings) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.scalabilityMode) || ""))
-            numberOfTemporalLayers = 3;
-        const maxSide = Math.max(width, height);
-        let spatialLayer = maxSide >= 480 ? (maxSide >= 960 ? 2 : 1) : 0;
-        let temporalLayer = numberOfTemporalLayers - 1;
-        if (maxSide < 100) {
-            temporalLayer = Math.max(numberOfTemporalLayers - 2, 0);
-        }
-        if (numberOfActiveVideos > 8 && spatialLayer === 0) {
-            temporalLayer = Math.max(numberOfTemporalLayers - 2, 0);
-        }
-        if (numberOfActiveVideos < 4 && maxSide > 300 && spatialLayer === 0) {
-            spatialLayer = 1;
-        }
-        if (((_d = this._features) === null || _d === void 0 ? void 0 : _d.uncappedSingleRemoteVideoOn) && numberOfActiveVideos === 1) {
-            spatialLayer = 2;
-            temporalLayer = numberOfTemporalLayers - 1;
-        }
         if (consumer.appData.spatialLayer !== spatialLayer || consumer.appData.temporalLayer !== temporalLayer) {
             consumer.appData.spatialLayer = spatialLayer;
             consumer.appData.temporalLayer = temporalLayer;
-            (_e = this._vegaConnection) === null || _e === void 0 ? void 0 : _e.message("setConsumersPreferredLayers", {
+            (_b = this._vegaConnection) === null || _b === void 0 ? void 0 : _b.message("setConsumersPreferredLayers", {
                 consumerIds: [consumerId],
                 spatialLayer,
                 temporalLayer,

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@whereby.com/media",
     "description": "Media library for Whereby",
-    "version": "1.6.0",
+    "version": "1.6.1",
     "license": "MIT",
     "homepage": "https://github.com/whereby/sdk",
     "repository": {