@webex/web-client-media-engine 1.40.6 → 1.40.8

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) {
@@ -5236,7 +5241,7 @@ function getFrameHeightByMaxFs(sourceAspectRatio, requestedMaxFs) {
     return (Math.floor(Math.sqrt((requestedMaxFs * 16 * 16) / (minNumberRatiosForWidth * minNumberRatiosForHeight))) * minNumberRatiosForHeight);
 }
 function getScaleDownRatio(sourceAspectRatio, sourceHeight, requestedMaxFs) {
-    return sourceHeight / getFrameHeightByMaxFs(sourceAspectRatio, requestedMaxFs);
+    return Math.max(sourceHeight / getFrameHeightByMaxFs(sourceAspectRatio, requestedMaxFs), 1.0);
 }
 function getRecommendedMaxBitrateForFrameSize(requestedMaxFs) {
     if (requestedMaxFs < 60) {
@@ -9060,15 +9065,14 @@ class SendOnlyTransceiver extends Transceiver {
             }
         });
     }
-    updateSimulcastStreamStates(requestedIdEncodingParamsMap) {
+    updateSendState(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) {
+                    if (encodingParams.scaleDownRatio) {
                         encoding.scaleResolutionDownBy = encodingParams.scaleDownRatio;
                     }
                     if (encodingParams.maxPayloadBitsPerSecond) {
@@ -9079,21 +9083,22 @@ class SendOnlyTransceiver extends Transceiver {
             yield this.sender.setParameters(sendParameters);
         });
     }
-    getScaleDownRatio(expectedMaxFs) {
+    getScaleDownRatio(maxFs, maxWidth, maxHeight) {
         var _a;
-        if (!expectedMaxFs) {
-            return -1;
-        }
-        if (!this.publishedTrack) {
-            return -1;
+        if (!this.publishedTrack || !maxFs) {
+            return undefined;
         }
         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;
+            return undefined;
+        }
+        let scaleDownRatio = getScaleDownRatio([sourceWidth, sourceHeight], sourceHeight, maxFs);
+        if (maxWidth && maxHeight) {
+            scaleDownRatio = Math.max(sourceWidth / maxWidth, sourceHeight / maxHeight, scaleDownRatio);
         }
-        return Math.max(getScaleDownRatio([sourceWidth, sourceHeight], sourceHeight, expectedMaxFs), 1.0);
+        return scaleDownRatio;
     }
     publishTrack(track) {
         return this.replacePublishedTrack(track);
@@ -9729,6 +9734,7 @@ logger.setLevel(Logger.DEBUG);
 function setLogLevel(level) {
     logger.setLevel(level);
     Logger$1.setLevel(level);
+    Logger$2.setLevel(level);
 }
 function getLogLevel() {
     return logger.getLevel();
@@ -9736,6 +9742,7 @@ function getLogLevel() {
 function setLogHandler(logHandler) {
     Logger.setHandler(logHandler);
     Logger$1.setHandler(logHandler);
+    Logger$2.setHandler(logHandler);
 }
 
 function toMediaStreamTrackKind(mediaType) {
@@ -9959,7 +9966,7 @@ class MultistreamConnection extends EventEmitter {
             logger.warn('Ignoring non-receiver-selected requests');
         }
         rsRequests.forEach(({ ids, policySpecificInfo, codecInfos, maxPayloadBitsPerSecond }) => {
-            var _a;
+            var _a, _b, _c;
             if (ids.length > 1) {
                 throw new Error(`More than a single ID being unexpected/invalid ${ids}`);
             }
@@ -9979,7 +9986,7 @@ class MultistreamConnection extends EventEmitter {
                 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),
+                        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,
                     });
                 }
@@ -9992,9 +9999,7 @@ class MultistreamConnection extends EventEmitter {
             }
         });
         sendTransceiver.setTrackRequested(requestedIdEncodingParamsMap.size > 0);
-        if (getMediaFamily(mediaType) === MediaFamily.Video) {
-            sendTransceiver.updateSimulcastStreamStates(requestedIdEncodingParamsMap);
-        }
+        sendTransceiver.updateSendState(requestedIdEncodingParamsMap);
     }
     createDataChannel() {
         const dataChannel = this.pc.createDataChannel('datachannel', {});