@whereby.com/media 1.27.0 → 1.29.0

package/dist/legacy-esm.js

@@ -1649,31 +1649,6 @@ class RtcStream {
     }
 }
 
-const lowPixelCount = 320 * 180;
-const lowBitratePerPixel = 150000 / lowPixelCount;
-const highPixelCount = 1280 * 720;
-const highBitratePerPixel = 1000000 / highPixelCount;
-const bitrateChangePerPixel = (highBitratePerPixel - lowBitratePerPixel) / (highPixelCount - lowPixelCount);
-function getOptimalBitrate(width, height, frameRate) {
-    let targetPixelCount = width * height;
-    if (targetPixelCount < lowPixelCount)
-        targetPixelCount = lowPixelCount;
-    if (targetPixelCount > highPixelCount)
-        targetPixelCount = highPixelCount;
-    let targetBitratePerPixel = lowBitratePerPixel;
-    if (targetPixelCount > highPixelCount)
-        targetBitratePerPixel = highBitratePerPixel;
-    else if (targetPixelCount > lowPixelCount) {
-        targetBitratePerPixel += (targetPixelCount - lowPixelCount) * bitrateChangePerPixel;
-    }
-    let targetBitrate = width * height * targetBitratePerPixel;
-    if (frameRate <= 15)
-        targetBitrate = targetBitrate * 0.7;
-    else if (frameRate <= 24)
-        targetBitrate = targetBitrate * 0.9;
-    return targetBitrate;
-}
-
 const word = "[a-fA-F\\d:]";
 const boundry = (options) => options && options.includeBoundaries ? `(?:(?<=\\s|^)(?=${word})|(?<=${word})(?=\\s|$))` : "";
 const v4 = "(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}";
@@ -2528,25 +2503,29 @@ const VIDEO_SETTINGS_VP9 = {
     codecOptions: {
         videoGoogleStartBitrate: 500,
     },
-    encodings: [{ scalabilityMode: "L3T2_KEY", maxBitrate: 1650000 }],
+    encodings: [{ scalabilityMode: "L3T2", maxBitrate: 1000000 }],
+};
+const VIDEO_SETTINGS_VP9_KEY = {
+    codecOptions: {
+        videoGoogleStartBitrate: 500,
+    },
+    encodings: [{ scalabilityMode: "L3T2_KEY", maxBitrate: 1250000 }],
 };
 const VIDEO_SETTINGS_VP9_LOW_BANDWIDTH = {
     codecOptions: {
         videoGoogleStartBitrate: 500,
     },
-    encodings: [{ scalabilityMode: "L2T2_KEY", maxBitrate: 800000 }],
+    encodings: [{ scalabilityMode: "L2T2", maxBitrate: 500000 }],
+};
+const VIDEO_SETTINGS_VP9_LOW_BANDWIDTH_KEY = {
+    codecOptions: {
+        videoGoogleStartBitrate: 500,
+    },
+    encodings: [{ scalabilityMode: "L2T2_KEY", maxBitrate: 650000 }],
 };
 const SCREEN_SHARE_SETTINGS = {
     encodings: [{}],
 };
-const SCREEN_SHARE_SETTINGS_LOW_BANDWIDTH = {
-    encodings: [
-        {
-            maxBitrate: 600000,
-            maxFramerate: 2,
-        },
-    ],
-};
 const SCREEN_SHARE_SIMULCAST_SETTINGS = {
     encodings: [
         { scaleResolutionDownBy: 2, dtx: true, maxBitrate: 500000 },
@@ -2567,54 +2546,95 @@ const SCREEN_SHARE_SETTINGS_VP9 = {
     encodings: [{ dtx: true }],
 };
 const getMediaSettings = (kind, isScreenShare, features, isSomeoneAlreadyPresenting = false) => {
-    const { lowDataModeEnabled, simulcastScreenshareOn, lowBandwidth, vp9On } = features;
+    const { lowDataModeEnabled, simulcastScreenshareOn, vp9On, svcKeyScalabilityModeOn } = features;
     if (kind === "audio") {
         return AUDIO_SETTINGS;
     }
+    const isChrome = adapterRaw.browserDetails.browser === "chrome";
+    const isVp9Available = isChrome && vp9On;
     if (isScreenShare) {
-        if (isSomeoneAlreadyPresenting) {
-            if (vp9On)
-                return ADDITIONAL_SCREEN_SHARE_SETTINGS_VP9;
-            return ADDITIONAL_SCREEN_SHARE_SETTINGS;
-        }
-        if (lowBandwidth && !vp9On)
-            return SCREEN_SHARE_SETTINGS_LOW_BANDWIDTH;
-        if (vp9On)
-            return SCREEN_SHARE_SETTINGS_VP9;
-        if (simulcastScreenshareOn)
-            return SCREEN_SHARE_SIMULCAST_SETTINGS;
-        return SCREEN_SHARE_SETTINGS;
+        return getScreenShareMediaSettings({
+            isVp9Available,
+            isSomeoneAlreadyPresenting,
+            simulcastScreenshareOn,
+        });
     }
     else {
-        if (lowBandwidth) {
-            if (vp9On)
-                return VIDEO_SETTINGS_VP9_LOW_BANDWIDTH;
-            return VIDEO_SETTINGS_SD;
+        return getCameraMediaSettings({
+            lowBandwidth: lowDataModeEnabled,
+            isVp9Available,
+            svcKeyScalabilityModeOn,
+        });
+    }
+};
+const getCameraMediaSettings = ({ lowBandwidth, isVp9Available, svcKeyScalabilityModeOn, }) => {
+    if (lowBandwidth) {
+        if (isVp9Available) {
+            if (svcKeyScalabilityModeOn)
+                return VIDEO_SETTINGS_VP9_LOW_BANDWIDTH_KEY;
+            return VIDEO_SETTINGS_VP9_LOW_BANDWIDTH;
         }
-        if (vp9On)
-            return VIDEO_SETTINGS_VP9;
-        if (lowDataModeEnabled)
-            return VIDEO_SETTINGS_SD;
-        return VIDEO_SETTINGS_HD;
+        return VIDEO_SETTINGS_SD;
     }
+    if (isVp9Available) {
+        if (svcKeyScalabilityModeOn)
+            return VIDEO_SETTINGS_VP9_KEY;
+        return VIDEO_SETTINGS_VP9;
+    }
+    return VIDEO_SETTINGS_HD;
+};
+const getScreenShareMediaSettings = ({ isVp9Available, isSomeoneAlreadyPresenting, simulcastScreenshareOn, }) => {
+    if (isSomeoneAlreadyPresenting) {
+        if (isVp9Available)
+            return ADDITIONAL_SCREEN_SHARE_SETTINGS_VP9;
+        return ADDITIONAL_SCREEN_SHARE_SETTINGS;
+    }
+    if (isVp9Available)
+        return SCREEN_SHARE_SETTINGS_VP9;
+    if (simulcastScreenshareOn)
+        return SCREEN_SHARE_SIMULCAST_SETTINGS;
+    return SCREEN_SHARE_SETTINGS;
 };
+var PrioritizableCodec;
+(function (PrioritizableCodec) {
+    PrioritizableCodec["H264"] = "video/h264";
+    PrioritizableCodec["VP9"] = "video/vp9";
+})(PrioritizableCodec || (PrioritizableCodec = {}));
 const modifyMediaCapabilities = (routerRtpCapabilities, features) => {
     const { vp9On, h264On } = features;
-    if (vp9On) {
-        const { preferredPayloadType } = routerRtpCapabilities.codecs.find((codec) => codec.mimeType.toLowerCase() === "video/vp9");
-        const { preferredPayloadType: aptPreferredPayloadType } = routerRtpCapabilities.codecs.find((codec) => codec.mimeType.toLowerCase() === "video/rtx" && codec.parameters.apt === preferredPayloadType);
-        routerRtpCapabilities.codecs = routerRtpCapabilities.codecs.filter((codec) => codec.kind === "audio" ||
-            codec.preferredPayloadType === preferredPayloadType ||
-            codec.preferredPayloadType === aptPreferredPayloadType);
+    const isChrome = adapterRaw.browserDetails.browser === "chrome";
+    if (!(routerRtpCapabilities === null || routerRtpCapabilities === void 0 ? void 0 : routerRtpCapabilities.codecs)) {
+        return routerRtpCapabilities;
+    }
+    if (vp9On && isChrome) {
+        const sorted = prioritizeRouterRtpCapabilitiesCodecs(routerRtpCapabilities.codecs, PrioritizableCodec.VP9);
+        return Object.assign(Object.assign({}, routerRtpCapabilities), { codecs: sorted });
     }
     else if (h264On) {
-        const { preferredPayloadType } = routerRtpCapabilities.codecs.find((codec) => codec.mimeType.toLowerCase() === "video/h264");
-        const { preferredPayloadType: aptPreferredPayloadType } = routerRtpCapabilities.codecs.find((codec) => codec.mimeType.toLowerCase() === "video/rtx" && codec.parameters.apt === preferredPayloadType);
-        routerRtpCapabilities.codecs = routerRtpCapabilities.codecs.filter((codec) => codec.kind === "audio" ||
-            codec.preferredPayloadType === preferredPayloadType ||
-            codec.preferredPayloadType === aptPreferredPayloadType);
+        const sorted = prioritizeRouterRtpCapabilitiesCodecs(routerRtpCapabilities.codecs, PrioritizableCodec.H264);
+        return Object.assign(Object.assign({}, routerRtpCapabilities), { codecs: sorted });
     }
+    return routerRtpCapabilities;
 };
+function prioritizeRouterRtpCapabilitiesCodecs(codecs, preferredCodec) {
+    const preferredCodecEntry = codecs.find(({ mimeType }) => mimeType.toLowerCase() === preferredCodec);
+    if (!preferredCodecEntry) {
+        return codecs;
+    }
+    return [...codecs].sort((left, right) => {
+        if (left.mimeType.toLowerCase() === preferredCodec) {
+            return -1;
+        }
+        if (left.mimeType.toLowerCase() === "video/rtx" &&
+            left.parameters.apt === preferredCodecEntry.preferredPayloadType) {
+            if (right.mimeType.toLowerCase() === preferredCodec) {
+                return 1;
+            }
+            return -1;
+        }
+        return 0;
+    });
+}
 function getPreferredOrder(availableCodecs, { vp9On, av1On }) {
     if (vp9On) {
         availableCodecs.unshift("video/vp9");
@@ -3928,12 +3948,12 @@ class P2pRtcManager {
         if (numPeers > 7) {
             numPeers = 7;
         }
-        let bandwidth = this._features.bandwidth
+        const bandwidth = this._features.bandwidth
             ? parseInt(this._features.bandwidth, 10)
             : {
-                1: this._features.lowBandwidth ? 768 : 0,
-                2: this._features.highP2PBandwidth && !this._features.lowBandwidth ? 768 : 384,
-                3: this._features.highP2PBandwidth && !this._features.lowBandwidth ? 512 : 256,
+                1: 0,
+                2: 384,
+                3: 256,
                 4: 192,
                 5: 128,
                 6: 128,
@@ -3942,22 +3962,6 @@ class P2pRtcManager {
         if (bandwidth === undefined) {
             return 0;
         }
-        if (this._features.adjustBitratesFromResolution) {
-            const cameraStream = this._getLocalCameraStream();
-            if (cameraStream) {
-                const cameraTrack = cameraStream && cameraStream.getVideoTracks()[0];
-                if (cameraTrack) {
-                    const { width, height, frameRate } = cameraTrack.getSettings();
-                    if (width && height && frameRate) {
-                        const optimalBandwidth = Math.round(getOptimalBitrate(width, height, frameRate) / 1000);
-                        bandwidth = Math.min(optimalBandwidth, bandwidth || optimalBandwidth);
-                    }
-                }
-            }
-        }
-        if (this._features.higherP2PBitrates && !this._features.lowBandwidth) {
-            bandwidth = bandwidth * 1.5;
-        }
         this._forEachPeerConnection((session) => {
             session.changeBandwidth(bandwidth);
         });
@@ -5220,9 +5224,9 @@ class VegaRtcManager {
             try {
                 const { routerRtpCapabilities } = yield this._vegaConnection.request("getCapabilities");
                 if (!this._routerRtpCapabilities) {
-                    modifyMediaCapabilities(routerRtpCapabilities, Object.assign(Object.assign({}, this._features), { vp9On: this._features.sfuVp9On }));
-                    this._routerRtpCapabilities = routerRtpCapabilities;
-                    yield ((_a = this._mediasoupDevice) === null || _a === void 0 ? void 0 : _a.load({ routerRtpCapabilities }));
+                    const modifiedCapabilities = modifyMediaCapabilities(routerRtpCapabilities, Object.assign(Object.assign({}, this._features), { vp9On: this._features.sfuVp9On }));
+                    this._routerRtpCapabilities = modifiedCapabilities;
+                    yield ((_a = this._mediasoupDevice) === null || _a === void 0 ? void 0 : _a.load({ routerRtpCapabilities: modifiedCapabilities }));
                 }
                 this._vegaConnection.message("setCapabilities", {
                     rtpCapabilities: (_b = this._mediasoupDevice) === null || _b === void 0 ? void 0 : _b.rtpCapabilities,
@@ -5576,7 +5580,7 @@ class VegaRtcManager {
                 return;
             }
             this._webcamProducerPromise = (() => __awaiter(this, void 0, void 0, function* () {
-                var _b, _c;
+                var _b;
                 try {
                     const currentPaused = this._webcamPaused;
                     const producer = yield this._sendTransport.produce(Object.assign(Object.assign({ track: this._webcamTrack, disableTrackOnPause: false, stopTracks: false }, getMediaSettings("video", false, Object.assign(Object.assign({}, this._features), { vp9On: this._features.sfuVp9On }))), { appData: {
@@ -5614,9 +5618,6 @@ class VegaRtcManager {
                         this._stopProducer(this._webcamProducer);
                         this._webcamProducer = null;
                     }
-                    if (this._features.lowBandwidth && this._screenVideoTrack) {
-                        (_c = this._webcamProducer) === null || _c === void 0 ? void 0 : _c.setMaxSpatialLayer(0);
-                    }
                 }
             }))();
         });
@@ -5675,7 +5676,6 @@ class VegaRtcManager {
         return __awaiter(this, void 0, void 0, function* () {
             logger$3.info("_internalSendScreenVideo()");
             this._screenVideoProducerPromise = (() => __awaiter(this, void 0, void 0, function* () {
-                var _a, _b;
                 try {
                     if (!this._screenVideoTrack || !this._sendTransport || this._screenVideoProducer) {
                         this._screenVideoProducerPromise = null;
@@ -5701,9 +5701,6 @@ class VegaRtcManager {
                     });
                     if (this._screenVideoTrack !== this._screenVideoProducer.track)
                         yield this._replaceScreenVideoTrack();
-                    if (this._features.lowBandwidth) {
-                        (_a = this._webcamProducer) === null || _a === void 0 ? void 0 : _a.setMaxSpatialLayer(0);
-                    }
                 }
                 catch (error) {
                     logger$3.error("screenVideoProducer failed:%o", error);
@@ -5713,9 +5710,6 @@ class VegaRtcManager {
                     if (!this._screenVideoTrack) {
                         yield this._stopProducer(this._screenVideoProducer);
                         this._screenVideoProducer = null;
-                        if (this._features.lowBandwidth) {
-                            (_b = this._webcamProducer) === null || _b === void 0 ? void 0 : _b.setMaxSpatialLayer(Number.MAX_VALUE);
-                        }
                     }
                 }
             }))();
@@ -5881,7 +5875,6 @@ class VegaRtcManager {
         }
     }
     removeStream(streamId, _stream, requestedByClientId) {
-        var _a;
         logger$3.info("removeStream() [streamId:%s, requestedByClientId:%s]", streamId, requestedByClientId);
         this._emitToSignal(PROTOCOL_REQUESTS.STOP_SCREENSHARE, {
             streamId: OUTBOUND_SCREEN_OUTBOUND_STREAM_ID,
@@ -5893,9 +5886,6 @@ class VegaRtcManager {
         this._stopProducer(this._screenAudioProducer);
         this._screenAudioProducer = null;
         this._screenAudioTrack = null;
-        if (this._features.lowBandwidth) {
-            (_a = this._webcamProducer) === null || _a === void 0 ? void 0 : _a.setMaxSpatialLayer(Number.MAX_VALUE);
-        }
     }
     _onMicAnalyserScoreUpdated(data) {
         var _a, _b;
@@ -7335,9 +7325,9 @@ class BandwidthTester extends EventEmitter {
             try {
                 const { routerRtpCapabilities } = yield this._vegaConnection.request("getCapabilities");
                 if (!this._routerRtpCapabilities) {
-                    modifyMediaCapabilities(routerRtpCapabilities, this._features);
-                    this._routerRtpCapabilities = routerRtpCapabilities;
-                    yield ((_a = this._mediasoupDevice) === null || _a === void 0 ? void 0 : _a.load({ routerRtpCapabilities }));
+                    const modifiedCapabilities = modifyMediaCapabilities(routerRtpCapabilities, Object.assign(Object.assign({}, this._features), { vp9On: this._features.sfuVp9On }));
+                    this._routerRtpCapabilities = modifiedCapabilities;
+                    yield ((_a = this._mediasoupDevice) === null || _a === void 0 ? void 0 : _a.load({ routerRtpCapabilities: modifiedCapabilities }));
                 }
                 this._vegaConnection.message("setCapabilities", {
                     rtpCapabilities: (_b = this._mediasoupDevice) === null || _b === void 0 ? void 0 : _b.rtpCapabilities,
@@ -7998,5 +7988,5 @@ var RtcEventNames;
     RtcEventNames["stream_added"] = "stream_added";
 })(RtcEventNames || (RtcEventNames = {}));
 
-export { BandwidthTester, EVENTS, KNOCK_MESSAGES, KalmanFilter, Logger, MAXIMUM_TURN_BANDWIDTH, MAXIMUM_TURN_BANDWIDTH_UNLIMITED, MEDIA_JITTER_BUFFER_TARGET, NoDevicesError, P2pRtcManager, PROTOCOL_ERRORS, PROTOCOL_EVENTS, PROTOCOL_REQUESTS, PROTOCOL_RESPONSES, RELAY_MESSAGES, ReconnectManager, RtcEventNames, RtcManagerDispatcher, RtcStream, STREAM_TYPES, ServerSocket, Session, SfuV2Parser, TYPES, VegaConnection, VegaMediaQualityMonitor, VegaRtcManager, addAbsCaptureTimeExtMap, addExtMap, assert, buildDeviceList, calculateStd, captureAudioSsrcMetrics, captureCandidatePairInfoMetrics, captureCommonSsrcMetrics, captureSsrcInfo, captureVideoSsrcMetrics, changeMediaDirection, cleanSdp, compareLocalDevices, createACFCalculator, createMicAnalyser, createWorker, deprioritizeH264, detectMicrophoneNotWorking, enumerate, external_stun_servers, filterMidExtension, filterMsidSemantic, fromLocation, generateByteString, getConstraints, getCurrentPeerConnections, getDeviceData, getDisplayMedia, getIssuesAndMetrics, getMediaConstraints, getMediaSettings, getMediasoupDevice, getNumFailedStatsReports, getNumFailedTrackSsrcLookups, getNumMissingTrackSsrcLookups, getOptimalBitrate, getPeerConnectionIndex, getStats, getStream, getUpdatedDevices, getUpdatedStats, getUserMedia, hasGetDisplayMedia, ipRegex, isMobile, isRelayed, maybeRejectNoH264, maybeTurnOnly, modifyMediaCapabilities, removePeerConnection, replaceSSRCs, replaceTracksInStream, rtcManagerEvents, rtcStats, setClientProvider, setCodecPreferenceSDP, setPeerConnectionsForTests, setVideoBandwidthUsingSetParameters, sortCodecs, standardDeviation, startPerformanceMonitor, stopStreamTracks, subscribeIssues, subscribeStats, turnServerOverride, variance };
+export { ADDITIONAL_SCREEN_SHARE_SETTINGS, ADDITIONAL_SCREEN_SHARE_SETTINGS_VP9, AUDIO_SETTINGS, BandwidthTester, EVENTS, KNOCK_MESSAGES, KalmanFilter, Logger, MAXIMUM_TURN_BANDWIDTH, MAXIMUM_TURN_BANDWIDTH_UNLIMITED, MEDIA_JITTER_BUFFER_TARGET, NoDevicesError, P2pRtcManager, PROTOCOL_ERRORS, PROTOCOL_EVENTS, PROTOCOL_REQUESTS, PROTOCOL_RESPONSES, RELAY_MESSAGES, ReconnectManager, RtcEventNames, RtcManagerDispatcher, RtcStream, SCREEN_SHARE_SETTINGS, SCREEN_SHARE_SETTINGS_VP9, SCREEN_SHARE_SIMULCAST_SETTINGS, STREAM_TYPES, ServerSocket, Session, SfuV2Parser, TYPES, VIDEO_SETTINGS_HD, VIDEO_SETTINGS_SD, VIDEO_SETTINGS_VP9, VIDEO_SETTINGS_VP9_KEY, VIDEO_SETTINGS_VP9_LOW_BANDWIDTH, VIDEO_SETTINGS_VP9_LOW_BANDWIDTH_KEY, VegaConnection, VegaMediaQualityMonitor, VegaRtcManager, addAbsCaptureTimeExtMap, addExtMap, assert, buildDeviceList, calculateStd, captureAudioSsrcMetrics, captureCandidatePairInfoMetrics, captureCommonSsrcMetrics, captureSsrcInfo, captureVideoSsrcMetrics, changeMediaDirection, cleanSdp, compareLocalDevices, createACFCalculator, createMicAnalyser, createWorker, deprioritizeH264, detectMicrophoneNotWorking, enumerate, external_stun_servers, filterMidExtension, filterMsidSemantic, fromLocation, generateByteString, getConstraints, getCurrentPeerConnections, getDeviceData, getDisplayMedia, getIssuesAndMetrics, getMediaConstraints, getMediaSettings, getMediasoupDevice, getNumFailedStatsReports, getNumFailedTrackSsrcLookups, getNumMissingTrackSsrcLookups, getPeerConnectionIndex, getStats, getStream, getUpdatedDevices, getUpdatedStats, getUserMedia, hasGetDisplayMedia, ipRegex, isMobile, isRelayed, maybeRejectNoH264, maybeTurnOnly, modifyMediaCapabilities, removePeerConnection, replaceSSRCs, replaceTracksInStream, rtcManagerEvents, rtcStats, setClientProvider, setCodecPreferenceSDP, setPeerConnectionsForTests, setVideoBandwidthUsingSetParameters, sortCodecs, standardDeviation, startPerformanceMonitor, stopStreamTracks, subscribeIssues, subscribeStats, turnServerOverride, variance };
 //# sourceMappingURL=legacy-esm.js.map

package/package.json

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