@whereby.com/media 1.17.14 → 1.17.15

package/dist/index.cjs

@@ -11,11 +11,10 @@ var validate = require('uuid-validate');
 var EventEmitter = require('events');
 var mediasoupClient = require('mediasoup-client');
 var uaParserJs = require('ua-parser-js');
-var Logger$1 = require('mediasoup-client/lib/Logger');
+var Logger_js = require('mediasoup-client/lib/Logger.js');
 var utils = require('mediasoup-client/lib/utils');
 var ortc = require('mediasoup-client/lib/ortc');
 var sdpCommonUtils = require('mediasoup-client/lib/handlers/sdp/commonUtils');
-var sdpUnifiedPlanUtils = require('mediasoup-client/lib/handlers/sdp/unifiedPlanUtils');
 var ortcUtils = require('mediasoup-client/lib/handlers/ortc/utils');
 var errors = require('mediasoup-client/lib/errors');
 var HandlerInterface = require('mediasoup-client/lib/handlers/HandlerInterface');
@@ -45,7 +44,6 @@ var sdpTransform__namespace = /*#__PURE__*/_interopNamespaceDefault(sdpTransform
 var utils__namespace = /*#__PURE__*/_interopNamespaceDefault(utils);
 var ortc__namespace = /*#__PURE__*/_interopNamespaceDefault(ortc);
 var sdpCommonUtils__namespace = /*#__PURE__*/_interopNamespaceDefault(sdpCommonUtils);
-var sdpUnifiedPlanUtils__namespace = /*#__PURE__*/_interopNamespaceDefault(sdpUnifiedPlanUtils);
 var ortcUtils__namespace = /*#__PURE__*/_interopNamespaceDefault(ortcUtils);
 
 const debugOn = process.env.NODE_ENV === "development" || new URLSearchParams(window.location.search).has("debug");
@@ -3512,7 +3510,7 @@ const modifyMediaCapabilities = (routerRtpCapabilities, features) => {
     }
 };
 
-const logger$5 = new Logger$1.Logger("Safari17");
+const logger$5 = new Logger_js.Logger("Safari17");
 const NAME = "Safari17";
 const SCTP_NUM_STREAMS = { OS: 1024, MIS: 1024 };
 class Safari17 extends HandlerInterface.HandlerInterface {
@@ -3694,20 +3692,31 @@ class Safari17 extends HandlerInterface.HandlerInterface {
             logger$5.debug("send() [kind:%s, track.id:%s]", track.kind, track.id);
             const sendingRtpParameters = utils__namespace.clone(this._sendingRtpParametersByKind[track.kind]);
             sendingRtpParameters.codecs = ortc__namespace.reduceCodecs(sendingRtpParameters.codecs, codec);
-            if (encodings && encodings.length > 1) {
-                let maxTemporalLayers = 1;
-                for (const encoding of encodings) {
-                    const temporalLayers = encoding.scalabilityMode
-                        ? scalabilityModes.parse(encoding.scalabilityMode).temporalLayers
-                        : 3;
-                    if (temporalLayers > maxTemporalLayers) {
-                        maxTemporalLayers = temporalLayers;
+            if (encodings && encodings.length > 1 && encodings.every(({ rid }) => !rid)) {
+                encodings = encodings.map((e, i) => {
+                    e.rid = `r${i}`;
+                    return e;
+                });
+            }
+            if (encodings) {
+                if (!sendingRtpParameters.encodings) {
+                    sendingRtpParameters.encodings = [];
+                }
+                Object.assign(sendingRtpParameters.encodings, encodings);
+            }
+            const layers = scalabilityModes.parse((encodings !== null && encodings !== void 0 ? encodings : [{}])[0].scalabilityMode);
+            if (sendingRtpParameters.encodings &&
+                sendingRtpParameters.encodings.length > 1 &&
+                (sendingRtpParameters.codecs[0].mimeType.toLowerCase() === "video/vp8" ||
+                    sendingRtpParameters.codecs[0].mimeType.toLowerCase() === "video/h264")) {
+                for (const encoding of sendingRtpParameters.encodings) {
+                    if (encoding.scalabilityMode) {
+                        encoding.scalabilityMode = `L1T${layers.temporalLayers}`;
+                    }
+                    else {
+                        encoding.scalabilityMode = "L1T3";
                     }
                 }
-                encodings.forEach((encoding, idx) => {
-                    encoding.rid = `r${idx}`;
-                    encoding.scalabilityMode = `L1T${maxTemporalLayers}`;
-                });
             }
             const sendingRemoteRtpParameters = utils__namespace.clone(this._sendingRemoteRtpParametersByKind[track.kind]);
             sendingRemoteRtpParameters.codecs = ortc__namespace.reduceCodecs(sendingRemoteRtpParameters.codecs, codec);
@@ -3715,56 +3724,28 @@ class Safari17 extends HandlerInterface.HandlerInterface {
             const transceiver = this._pc.addTransceiver(track, {
                 direction: "sendonly",
                 streams: [this._sendStream],
-                sendEncodings: encodings,
+                sendEncodings: track.kind === "video" ? encodings : undefined,
             });
             if (onRtpSender) {
                 onRtpSender(transceiver.sender);
             }
             const offer = yield this._pc.createOffer();
-            let localSdpObject = sdpTransform__namespace.parse(offer.sdp);
+            const localSdpObject = sdpTransform__namespace.parse(offer.sdp);
+            let offerMediaObject = localSdpObject.media[mediaSectionIdx.idx];
             if (!this._transportReady) {
                 yield this.setupTransport({
                     localDtlsRole: (_a = this._forcedLocalDtlsRole) !== null && _a !== void 0 ? _a : "client",
                     localSdpObject,
                 });
             }
-            const layers = scalabilityModes.parse((encodings !== null && encodings !== void 0 ? encodings : [{}])[0].scalabilityMode);
             logger$5.debug("send() | calling pc.setLocalDescription() [offer:%o]", offer);
             yield this._pc.setLocalDescription(offer);
             const localId = transceiver.mid;
             sendingRtpParameters.mid = localId;
-            localSdpObject = sdpTransform__namespace.parse(this._pc.localDescription.sdp);
-            const offerMediaObject = localSdpObject.media[mediaSectionIdx.idx];
+            offerMediaObject = localSdpObject.media[mediaSectionIdx.idx];
             sendingRtpParameters.rtcp.cname = sdpCommonUtils__namespace.getCname({
                 offerMediaObject,
             });
-            if (!encodings) {
-                sendingRtpParameters.encodings = sdpUnifiedPlanUtils__namespace.getRtpEncodings({
-                    offerMediaObject,
-                });
-            }
-            else if (encodings.length === 1) {
-                const newEncodings = sdpUnifiedPlanUtils__namespace.getRtpEncodings({
-                    offerMediaObject,
-                });
-                Object.assign(newEncodings[0], encodings[0]);
-                sendingRtpParameters.encodings = newEncodings;
-            }
-            else {
-                sendingRtpParameters.encodings = encodings;
-            }
-            if (sendingRtpParameters.encodings.length > 1 &&
-                (sendingRtpParameters.codecs[0].mimeType.toLowerCase() === "video/vp8" ||
-                    sendingRtpParameters.codecs[0].mimeType.toLowerCase() === "video/h264")) {
-                for (const encoding of sendingRtpParameters.encodings) {
-                    if (encoding.scalabilityMode) {
-                        encoding.scalabilityMode = `L1T${layers.temporalLayers}`;
-                    }
-                    else {
-                        encoding.scalabilityMode = "L1T3";
-                    }
-                }
-            }
             this._remoteSdp.send({
                 offerMediaObject,
                 reuseMid: mediaSectionIdx.reuseMid,

package/dist/index.mjs

@@ -9,11 +9,10 @@ import validate from 'uuid-validate';
 import EventEmitter$1, { EventEmitter } from 'events';
 import { Device, detectDevice } from 'mediasoup-client';
 import { UAParser } from 'ua-parser-js';
-import { Logger as Logger$1 } from 'mediasoup-client/lib/Logger';
+import { Logger as Logger$1 } from 'mediasoup-client/lib/Logger.js';
 import * as utils from 'mediasoup-client/lib/utils';
 import * as ortc from 'mediasoup-client/lib/ortc';
 import * as sdpCommonUtils from 'mediasoup-client/lib/handlers/sdp/commonUtils';
-import * as sdpUnifiedPlanUtils from 'mediasoup-client/lib/handlers/sdp/unifiedPlanUtils';
 import * as ortcUtils from 'mediasoup-client/lib/handlers/ortc/utils';
 import { InvalidStateError } from 'mediasoup-client/lib/errors';
 import { HandlerInterface } from 'mediasoup-client/lib/handlers/HandlerInterface';
@@ -3668,20 +3667,31 @@ class Safari17 extends HandlerInterface {
             logger$5.debug("send() [kind:%s, track.id:%s]", track.kind, track.id);
             const sendingRtpParameters = utils.clone(this._sendingRtpParametersByKind[track.kind]);
             sendingRtpParameters.codecs = ortc.reduceCodecs(sendingRtpParameters.codecs, codec);
-            if (encodings && encodings.length > 1) {
-                let maxTemporalLayers = 1;
-                for (const encoding of encodings) {
-                    const temporalLayers = encoding.scalabilityMode
-                        ? parse(encoding.scalabilityMode).temporalLayers
-                        : 3;
-                    if (temporalLayers > maxTemporalLayers) {
-                        maxTemporalLayers = temporalLayers;
+            if (encodings && encodings.length > 1 && encodings.every(({ rid }) => !rid)) {
+                encodings = encodings.map((e, i) => {
+                    e.rid = `r${i}`;
+                    return e;
+                });
+            }
+            if (encodings) {
+                if (!sendingRtpParameters.encodings) {
+                    sendingRtpParameters.encodings = [];
+                }
+                Object.assign(sendingRtpParameters.encodings, encodings);
+            }
+            const layers = parse((encodings !== null && encodings !== void 0 ? encodings : [{}])[0].scalabilityMode);
+            if (sendingRtpParameters.encodings &&
+                sendingRtpParameters.encodings.length > 1 &&
+                (sendingRtpParameters.codecs[0].mimeType.toLowerCase() === "video/vp8" ||
+                    sendingRtpParameters.codecs[0].mimeType.toLowerCase() === "video/h264")) {
+                for (const encoding of sendingRtpParameters.encodings) {
+                    if (encoding.scalabilityMode) {
+                        encoding.scalabilityMode = `L1T${layers.temporalLayers}`;
+                    }
+                    else {
+                        encoding.scalabilityMode = "L1T3";
                     }
                 }
-                encodings.forEach((encoding, idx) => {
-                    encoding.rid = `r${idx}`;
-                    encoding.scalabilityMode = `L1T${maxTemporalLayers}`;
-                });
             }
             const sendingRemoteRtpParameters = utils.clone(this._sendingRemoteRtpParametersByKind[track.kind]);
             sendingRemoteRtpParameters.codecs = ortc.reduceCodecs(sendingRemoteRtpParameters.codecs, codec);
@@ -3689,56 +3699,28 @@ class Safari17 extends HandlerInterface {
             const transceiver = this._pc.addTransceiver(track, {
                 direction: "sendonly",
                 streams: [this._sendStream],
-                sendEncodings: encodings,
+                sendEncodings: track.kind === "video" ? encodings : undefined,
             });
             if (onRtpSender) {
                 onRtpSender(transceiver.sender);
             }
             const offer = yield this._pc.createOffer();
-            let localSdpObject = sdpTransform.parse(offer.sdp);
+            const localSdpObject = sdpTransform.parse(offer.sdp);
+            let offerMediaObject = localSdpObject.media[mediaSectionIdx.idx];
             if (!this._transportReady) {
                 yield this.setupTransport({
                     localDtlsRole: (_a = this._forcedLocalDtlsRole) !== null && _a !== void 0 ? _a : "client",
                     localSdpObject,
                 });
             }
-            const layers = parse((encodings !== null && encodings !== void 0 ? encodings : [{}])[0].scalabilityMode);
             logger$5.debug("send() | calling pc.setLocalDescription() [offer:%o]", offer);
             yield this._pc.setLocalDescription(offer);
             const localId = transceiver.mid;
             sendingRtpParameters.mid = localId;
-            localSdpObject = sdpTransform.parse(this._pc.localDescription.sdp);
-            const offerMediaObject = localSdpObject.media[mediaSectionIdx.idx];
+            offerMediaObject = localSdpObject.media[mediaSectionIdx.idx];
             sendingRtpParameters.rtcp.cname = sdpCommonUtils.getCname({
                 offerMediaObject,
             });
-            if (!encodings) {
-                sendingRtpParameters.encodings = sdpUnifiedPlanUtils.getRtpEncodings({
-                    offerMediaObject,
-                });
-            }
-            else if (encodings.length === 1) {
-                const newEncodings = sdpUnifiedPlanUtils.getRtpEncodings({
-                    offerMediaObject,
-                });
-                Object.assign(newEncodings[0], encodings[0]);
-                sendingRtpParameters.encodings = newEncodings;
-            }
-            else {
-                sendingRtpParameters.encodings = encodings;
-            }
-            if (sendingRtpParameters.encodings.length > 1 &&
-                (sendingRtpParameters.codecs[0].mimeType.toLowerCase() === "video/vp8" ||
-                    sendingRtpParameters.codecs[0].mimeType.toLowerCase() === "video/h264")) {
-                for (const encoding of sendingRtpParameters.encodings) {
-                    if (encoding.scalabilityMode) {
-                        encoding.scalabilityMode = `L1T${layers.temporalLayers}`;
-                    }
-                    else {
-                        encoding.scalabilityMode = "L1T3";
-                    }
-                }
-            }
             this._remoteSdp.send({
                 offerMediaObject,
                 reuseMid: mediaSectionIdx.reuseMid,

package/dist/legacy-esm.js

@@ -9,11 +9,10 @@ import validate from 'uuid-validate';
 import EventEmitter$1, { EventEmitter } from 'events';
 import { Device, detectDevice } from 'mediasoup-client';
 import { UAParser } from 'ua-parser-js';
-import { Logger as Logger$1 } from 'mediasoup-client/lib/Logger';
+import { Logger as Logger$1 } from 'mediasoup-client/lib/Logger.js';
 import * as utils from 'mediasoup-client/lib/utils';
 import * as ortc from 'mediasoup-client/lib/ortc';
 import * as sdpCommonUtils from 'mediasoup-client/lib/handlers/sdp/commonUtils';
-import * as sdpUnifiedPlanUtils from 'mediasoup-client/lib/handlers/sdp/unifiedPlanUtils';
 import * as ortcUtils from 'mediasoup-client/lib/handlers/ortc/utils';
 import { InvalidStateError } from 'mediasoup-client/lib/errors';
 import { HandlerInterface } from 'mediasoup-client/lib/handlers/HandlerInterface';
@@ -3668,20 +3667,31 @@ class Safari17 extends HandlerInterface {
             logger$5.debug("send() [kind:%s, track.id:%s]", track.kind, track.id);
             const sendingRtpParameters = utils.clone(this._sendingRtpParametersByKind[track.kind]);
             sendingRtpParameters.codecs = ortc.reduceCodecs(sendingRtpParameters.codecs, codec);
-            if (encodings && encodings.length > 1) {
-                let maxTemporalLayers = 1;
-                for (const encoding of encodings) {
-                    const temporalLayers = encoding.scalabilityMode
-                        ? parse(encoding.scalabilityMode).temporalLayers
-                        : 3;
-                    if (temporalLayers > maxTemporalLayers) {
-                        maxTemporalLayers = temporalLayers;
+            if (encodings && encodings.length > 1 && encodings.every(({ rid }) => !rid)) {
+                encodings = encodings.map((e, i) => {
+                    e.rid = `r${i}`;
+                    return e;
+                });
+            }
+            if (encodings) {
+                if (!sendingRtpParameters.encodings) {
+                    sendingRtpParameters.encodings = [];
+                }
+                Object.assign(sendingRtpParameters.encodings, encodings);
+            }
+            const layers = parse((encodings !== null && encodings !== void 0 ? encodings : [{}])[0].scalabilityMode);
+            if (sendingRtpParameters.encodings &&
+                sendingRtpParameters.encodings.length > 1 &&
+                (sendingRtpParameters.codecs[0].mimeType.toLowerCase() === "video/vp8" ||
+                    sendingRtpParameters.codecs[0].mimeType.toLowerCase() === "video/h264")) {
+                for (const encoding of sendingRtpParameters.encodings) {
+                    if (encoding.scalabilityMode) {
+                        encoding.scalabilityMode = `L1T${layers.temporalLayers}`;
+                    }
+                    else {
+                        encoding.scalabilityMode = "L1T3";
                     }
                 }
-                encodings.forEach((encoding, idx) => {
-                    encoding.rid = `r${idx}`;
-                    encoding.scalabilityMode = `L1T${maxTemporalLayers}`;
-                });
             }
             const sendingRemoteRtpParameters = utils.clone(this._sendingRemoteRtpParametersByKind[track.kind]);
             sendingRemoteRtpParameters.codecs = ortc.reduceCodecs(sendingRemoteRtpParameters.codecs, codec);
@@ -3689,56 +3699,28 @@ class Safari17 extends HandlerInterface {
             const transceiver = this._pc.addTransceiver(track, {
                 direction: "sendonly",
                 streams: [this._sendStream],
-                sendEncodings: encodings,
+                sendEncodings: track.kind === "video" ? encodings : undefined,
             });
             if (onRtpSender) {
                 onRtpSender(transceiver.sender);
             }
             const offer = yield this._pc.createOffer();
-            let localSdpObject = sdpTransform.parse(offer.sdp);
+            const localSdpObject = sdpTransform.parse(offer.sdp);
+            let offerMediaObject = localSdpObject.media[mediaSectionIdx.idx];
             if (!this._transportReady) {
                 yield this.setupTransport({
                     localDtlsRole: (_a = this._forcedLocalDtlsRole) !== null && _a !== void 0 ? _a : "client",
                     localSdpObject,
                 });
             }
-            const layers = parse((encodings !== null && encodings !== void 0 ? encodings : [{}])[0].scalabilityMode);
             logger$5.debug("send() | calling pc.setLocalDescription() [offer:%o]", offer);
             yield this._pc.setLocalDescription(offer);
             const localId = transceiver.mid;
             sendingRtpParameters.mid = localId;
-            localSdpObject = sdpTransform.parse(this._pc.localDescription.sdp);
-            const offerMediaObject = localSdpObject.media[mediaSectionIdx.idx];
+            offerMediaObject = localSdpObject.media[mediaSectionIdx.idx];
             sendingRtpParameters.rtcp.cname = sdpCommonUtils.getCname({
                 offerMediaObject,
             });
-            if (!encodings) {
-                sendingRtpParameters.encodings = sdpUnifiedPlanUtils.getRtpEncodings({
-                    offerMediaObject,
-                });
-            }
-            else if (encodings.length === 1) {
-                const newEncodings = sdpUnifiedPlanUtils.getRtpEncodings({
-                    offerMediaObject,
-                });
-                Object.assign(newEncodings[0], encodings[0]);
-                sendingRtpParameters.encodings = newEncodings;
-            }
-            else {
-                sendingRtpParameters.encodings = encodings;
-            }
-            if (sendingRtpParameters.encodings.length > 1 &&
-                (sendingRtpParameters.codecs[0].mimeType.toLowerCase() === "video/vp8" ||
-                    sendingRtpParameters.codecs[0].mimeType.toLowerCase() === "video/h264")) {
-                for (const encoding of sendingRtpParameters.encodings) {
-                    if (encoding.scalabilityMode) {
-                        encoding.scalabilityMode = `L1T${layers.temporalLayers}`;
-                    }
-                    else {
-                        encoding.scalabilityMode = "L1T3";
-                    }
-                }
-            }
             this._remoteSdp.send({
                 offerMediaObject,
                 reuseMid: mediaSectionIdx.reuseMid,

package/package.json

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