@webex/web-client-media-engine 1.40.7 → 1.41.0

package/dist/cjs/index.js

@@ -19,7 +19,7 @@ function _mergeNamespaces$1(n, m) {
     return Object.freeze(n);
 }
 
-/*! *****************************************************************************
+/******************************************************************************
 Copyright (c) Microsoft Corporation.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -332,8 +332,13 @@ var Logger$2 = logger$1$1.exports;
 
 const DEFAULT_LOGGER_NAME$1 = 'webrtc-core';
 const logger$3 = Logger$2.get(DEFAULT_LOGGER_NAME$1);
-// Set log level to debug by default.
-logger$3.setLevel(Logger$2.DEBUG);
+Logger$2.useDefaults({
+    defaultLevel: Logger$2.DEBUG,
+    /* eslint-disable-next-line jsdoc/require-jsdoc */
+    formatter: (messages, context) => {
+        messages.unshift(`[${context.name}]`);
+    },
+});
 
 var DeviceKind;
 (function (DeviceKind) {
@@ -1282,16 +1287,26 @@ class LocalTrack extends EventEmitter$2 {
         }
         return effect;
     }
+    /**
+     * Get a copy of the effects Map.
+     *
+     * @returns A copy of the effects map.
+     */
+    getEffects() {
+        return new Map(this.effects);
+    }
     /**
      * Cleanup the local microphone track.
      */
     disposeEffects() {
-        if (this.effects.size > 0) {
-            this.effects.forEach((effect) => effect.dispose());
-            this.effects.clear();
-            this.underlyingStream = this.originalStream;
-            this.emit(exports.LocalTrackEvents.UnderlyingTrackChange);
-        }
+        return __awaiter$1(this, void 0, void 0, function* () {
+            if (this.effects.size > 0) {
+                yield Promise.all(Array.from(this.effects.values(), (effect) => effect.dispose()));
+                this.effects.clear();
+                this.underlyingStream = this.originalStream;
+                this.emit(exports.LocalTrackEvents.UnderlyingTrackChange);
+            }
+        });
     }
     /**
      * Apply constraints to the track.
@@ -5235,8 +5250,15 @@ function getFrameHeightByMaxFs(sourceAspectRatio, requestedMaxFs) {
     const minNumberRatiosForHeight = sourceAspectRatio[1] / _gcd;
     return (Math.floor(Math.sqrt((requestedMaxFs * 16 * 16) / (minNumberRatiosForWidth * minNumberRatiosForHeight))) * minNumberRatiosForHeight);
 }
-function getScaleDownRatio(sourceAspectRatio, sourceHeight, requestedMaxFs) {
-    return Math.max(sourceHeight / getFrameHeightByMaxFs(sourceAspectRatio, requestedMaxFs), 1.0);
+function getScaleDownRatio(sourceWidth, sourceHeight, maxFs, maxWidth, maxHeight) {
+    if (!sourceWidth || !sourceHeight || !maxFs) {
+        return undefined;
+    }
+    let scaleDownRatio = Math.max(sourceHeight / getFrameHeightByMaxFs([sourceWidth, sourceHeight], maxFs), 1.0);
+    if (maxWidth && maxHeight) {
+        scaleDownRatio = Math.max(sourceWidth / maxWidth, sourceHeight / maxHeight, scaleDownRatio);
+    }
+    return scaleDownRatio;
 }
 function getRecommendedMaxBitrateForFrameSize(requestedMaxFs) {
     if (requestedMaxFs < 60) {
@@ -9060,45 +9082,6 @@ class SendOnlyTransceiver extends Transceiver {
             }
         });
     }
-    updateSimulcastStreamStates(requestedIdEncodingParamsMap) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sendParameters = this.sender.getParameters();
-            sendParameters.encodings.forEach((encoding, index) => {
-                const encodingParams = requestedIdEncodingParamsMap.get(index);
-                encoding.active = Boolean(encodingParams);
-                if (encodingParams) {
-                    if (encodingParams.scaleDownRatio >= 1 &&
-                        encoding.scaleResolutionDownBy !== encodingParams.scaleDownRatio) {
-                        encoding.scaleResolutionDownBy = encodingParams.scaleDownRatio;
-                    }
-                    if (encodingParams.maxPayloadBitsPerSecond) {
-                        encoding.maxBitrate = encodingParams.maxPayloadBitsPerSecond;
-                    }
-                }
-            });
-            yield this.sender.setParameters(sendParameters);
-        });
-    }
-    getScaleDownRatio(maxFs, maxWidth, maxHeight) {
-        var _a;
-        if (!maxFs) {
-            return -1;
-        }
-        if (!this.publishedTrack) {
-            return -1;
-        }
-        const setting = (_a = this.publishedTrack) === null || _a === void 0 ? void 0 : _a.underlyingTrack.getSettings();
-        const sourceHeight = setting === null || setting === void 0 ? void 0 : setting.height;
-        const sourceWidth = setting === null || setting === void 0 ? void 0 : setting.width;
-        if (!sourceWidth || !sourceHeight) {
-            return -1;
-        }
-        let scaleDownRatio = getScaleDownRatio([sourceWidth, sourceHeight], sourceHeight, maxFs);
-        if (maxWidth && maxHeight) {
-            scaleDownRatio = Math.max(sourceWidth / maxWidth, sourceHeight / maxHeight, scaleDownRatio);
-        }
-        return scaleDownRatio;
-    }
     publishTrack(track) {
         return this.replacePublishedTrack(track);
     }
@@ -9113,6 +9096,25 @@ class SendOnlyTransceiver extends Transceiver {
     getStats() {
         return this.sender.getStats();
     }
+    updateSendParameters(requestedIdEncodingParamsMap) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const sendParameters = this.sender.getParameters();
+            sendParameters.encodings.forEach((encoding, index) => {
+                const encodingParams = requestedIdEncodingParamsMap.get(index);
+                encoding.active = !!encodingParams;
+                if (encodingParams) {
+                    const { maxPayloadBitsPerSecond, scaleDownRatio } = encodingParams;
+                    if (maxPayloadBitsPerSecond !== undefined && maxPayloadBitsPerSecond >= 0) {
+                        encoding.maxBitrate = maxPayloadBitsPerSecond;
+                    }
+                    if (scaleDownRatio !== undefined && scaleDownRatio >= 1.0) {
+                        encoding.scaleResolutionDownBy = scaleDownRatio;
+                    }
+                }
+            });
+            yield this.sender.setParameters(sendParameters);
+        });
+    }
 }
 
 class StatsManager {
@@ -9733,6 +9735,7 @@ logger.setLevel(Logger.DEBUG);
 function setLogLevel(level) {
     logger.setLevel(level);
     Logger$1.setLevel(level);
+    Logger$2.setLevel(level);
 }
 function getLogLevel() {
     return logger.getLevel();
@@ -9740,6 +9743,7 @@ function getLogLevel() {
 function setLogHandler(logHandler) {
     Logger.setHandler(logHandler);
     Logger$1.setHandler(logHandler);
+    Logger$2.setHandler(logHandler);
 }
 
 function toMediaStreamTrackKind(mediaType) {
@@ -9957,13 +9961,14 @@ class MultistreamConnection extends EventEmitter {
     updateRequestedStreams(mediaType, requests) {
         const sendTransceiver = this.getSendTransceiverOrThrow(mediaType);
         const signaler = this.streamSignalerManager.getEgressStreamSignalerOrThrow(sendTransceiver.mid);
+        const mediaFamily = getMediaFamily(mediaType);
         const requestedIdEncodingParamsMap = new Map();
         const rsRequests = requests.filter((r) => isValidReceiverSelectedInfo(r.policySpecificInfo));
         if (rsRequests.length !== requests.length) {
             logger.warn('Ignoring non-receiver-selected requests');
         }
         rsRequests.forEach(({ ids, policySpecificInfo, codecInfos, maxPayloadBitsPerSecond }) => {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             if (ids.length > 1) {
                 throw new Error(`More than a single ID being unexpected/invalid ${ids}`);
             }
@@ -9982,10 +9987,14 @@ class MultistreamConnection extends EventEmitter {
             if (streamIdsMatched) {
                 const encodingIndex = signaler.getEncodingIndexForStreamId(id);
                 if (encodingIndex !== -1) {
-                    requestedIdEncodingParamsMap.set(encodingIndex, {
-                        scaleDownRatio: sendTransceiver.getScaleDownRatio((_a = codecInfo === null || codecInfo === void 0 ? void 0 : codecInfo.h264) === null || _a === void 0 ? void 0 : _a.maxFs, (_b = codecInfo === null || codecInfo === void 0 ? void 0 : codecInfo.h264) === null || _b === void 0 ? void 0 : _b.maxWidth, (_c = codecInfo === null || codecInfo === void 0 ? void 0 : codecInfo.h264) === null || _c === void 0 ? void 0 : _c.maxHeight),
-                        maxPayloadBitsPerSecond,
-                    });
+                    const encodingParams = { maxPayloadBitsPerSecond };
+                    if (mediaFamily === MediaFamily.Video) {
+                        const trackSettings = (_a = sendTransceiver.publishedTrack) === null || _a === void 0 ? void 0 : _a.getSettings();
+                        if (trackSettings) {
+                            encodingParams.scaleDownRatio = getScaleDownRatio(trackSettings.width, trackSettings.height, (_b = codecInfo === null || codecInfo === void 0 ? void 0 : codecInfo.h264) === null || _b === void 0 ? void 0 : _b.maxFs, (_c = codecInfo === null || codecInfo === void 0 ? void 0 : codecInfo.h264) === null || _c === void 0 ? void 0 : _c.maxWidth, (_d = codecInfo === null || codecInfo === void 0 ? void 0 : codecInfo.h264) === null || _d === void 0 ? void 0 : _d.maxHeight);
+                        }
+                    }
+                    requestedIdEncodingParamsMap.set(encodingIndex, encodingParams);
                 }
                 else {
                     logger.warn(`${mediaType}: Unable to get encoding index for stream ID: ${JSON.stringify(id)}`);
@@ -9996,9 +10005,7 @@ class MultistreamConnection extends EventEmitter {
             }
         });
         sendTransceiver.setTrackRequested(requestedIdEncodingParamsMap.size > 0);
-        if (getMediaFamily(mediaType) === MediaFamily.Video) {
-            sendTransceiver.updateSimulcastStreamStates(requestedIdEncodingParamsMap);
-        }
+        sendTransceiver.updateSendParameters(requestedIdEncodingParamsMap);
     }
     createDataChannel() {
         const dataChannel = this.pc.createDataChannel('datachannel', {});