@webex/web-client-media-engine 2.1.3 → 2.1.4

package/dist/cjs/index.js

@@ -9432,12 +9432,17 @@ class SendOnlyTransceiver extends Transceiver {
     }
     updateSendParameters(requestedIdEncodingParamsMap) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this.publishedTrack)
+                return;
+            this.setTrackRequested(requestedIdEncodingParamsMap.size > 0);
             const sendParameters = this.sender.getParameters();
             sendParameters.encodings.forEach((encoding, index) => {
+                var _a, _b;
                 const encodingParams = requestedIdEncodingParamsMap.get(index);
                 encoding.active = !!encodingParams;
                 if (encodingParams) {
-                    const { maxPayloadBitsPerSecond, scaleDownRatio } = encodingParams;
+                    const { maxPayloadBitsPerSecond, maxFs, maxWidth, maxHeight } = encodingParams;
+                    const scaleDownRatio = getScaleDownRatio((_a = this.publishedTrack) === null || _a === void 0 ? void 0 : _a.getSettings().width, (_b = this.publishedTrack) === null || _b === void 0 ? void 0 : _b.getSettings().height, maxFs, maxWidth, maxHeight);
                     if (maxPayloadBitsPerSecond !== undefined && maxPayloadBitsPerSecond >= 0) {
                         encoding.maxBitrate = maxPayloadBitsPerSecond;
                     }
@@ -13282,6 +13287,7 @@ class MultistreamConnection extends EventEmitter {
         this.overuseUpdateCallback = () => { };
         this.midPredictor = new MidPredictor();
         this.offerAnswerQueue = new AsyncQueue();
+        this.requestedIdEncodingParamsMap = new Map();
         this.options = Object.assign(Object.assign({}, defaultMultistreamConnectionOptions), userOptions);
         logger.info(`Creating multistream connection with options ${JSON.stringify(this.options)}`);
         this.initializePeerConnection();
@@ -13405,7 +13411,7 @@ class MultistreamConnection extends EventEmitter {
             logger.warn('Ignoring non-receiver-selected requests');
         }
         rsRequests.forEach(({ ids, policySpecificInfo, codecInfos, maxPayloadBitsPerSecond }) => {
-            var _a, _b, _c, _d;
+            var _a, _b, _c;
             if (ids.length > 1) {
                 throw new Error(`More than a single ID being unexpected/invalid ${ids}`);
             }
@@ -13424,10 +13430,9 @@ class MultistreamConnection extends EventEmitter {
                 if (encodingIndex !== -1) {
                     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);
-                        }
+                        encodingParams.maxFs = (_a = codecInfo === null || codecInfo === void 0 ? void 0 : codecInfo.h264) === null || _a === void 0 ? void 0 : _a.maxFs;
+                        encodingParams.maxWidth = (_b = codecInfo === null || codecInfo === void 0 ? void 0 : codecInfo.h264) === null || _b === void 0 ? void 0 : _b.maxWidth;
+                        encodingParams.maxHeight = (_c = codecInfo === null || codecInfo === void 0 ? void 0 : codecInfo.h264) === null || _c === void 0 ? void 0 : _c.maxHeight;
                     }
                     requestedIdEncodingParamsMap.set(encodingIndex, encodingParams);
                 }
@@ -13439,8 +13444,8 @@ class MultistreamConnection extends EventEmitter {
                 logger.warn(`${mediaType}: Unable to find matching stream ID for requested ID: ${JSON.stringify(id)}`);
             }
         });
-        sendTransceiver.setTrackRequested(requestedIdEncodingParamsMap.size > 0);
         sendTransceiver.updateSendParameters(requestedIdEncodingParamsMap);
+        this.requestedIdEncodingParamsMap = requestedIdEncodingParamsMap;
     }
     createDataChannel() {
         const dataChannel = this.pc.createDataChannel('datachannel', {});
@@ -13581,8 +13586,9 @@ class MultistreamConnection extends EventEmitter {
         });
     }
     addTrackListeners(mediaType, track) {
+        const sendTransceiver = this.getSendTransceiverOrThrow(mediaType);
         const onTrackResolutionChange = () => {
-            this.sendMediaRequestStatus(mediaType);
+            sendTransceiver.updateSendParameters(this.requestedIdEncodingParamsMap);
         };
         track.on(LocalTrack.Events.TrackConstraintsChange, onTrackResolutionChange);
         const onTrackMute = () => {
@@ -13599,16 +13605,18 @@ class MultistreamConnection extends EventEmitter {
             if (!track.muted) {
                 this.sendSourceAdvertisement(mediaType);
                 this.sendMediaRequestStatus(mediaType);
+                if (mediaType === MediaType.VideoMain) {
+                    sendTransceiver.updateSendParameters(this.requestedIdEncodingParamsMap);
+                }
             }
         };
         track.on(LocalTrack.Events.PublishedStateUpdate, onTrackPublish);
     }
     getVideoStreamStates(mediaType) {
-        var _a, _b, _c;
+        var _a, _b;
         const sendTransceiver = this.getSendTransceiverOrThrow(mediaType);
-        const activeSimulcastLayerNumber = ((_a = sendTransceiver.publishedTrack) === null || _a === void 0 ? void 0 : _a.getNumActiveSimulcastLayers()) || 0;
-        const published = (_b = sendTransceiver.publishedTrack) === null || _b === void 0 ? void 0 : _b.published;
-        const muted = ((_c = sendTransceiver.publishedTrack) === null || _c === void 0 ? void 0 : _c.muted) === true;
+        const published = (_a = sendTransceiver.publishedTrack) === null || _a === void 0 ? void 0 : _a.published;
+        const muted = ((_b = sendTransceiver.publishedTrack) === null || _b === void 0 ? void 0 : _b.muted) === true;
         return sendTransceiver.senderIds.map((id) => {
             let state;
             if (!published) {
@@ -13617,9 +13625,6 @@ class MultistreamConnection extends EventEmitter {
             else if (muted) {
                 state = 'avatar';
             }
-            else if (activeSimulcastLayerNumber < sendTransceiver.getEncodingIndexForStreamId(id)) {
-                state = 'no source';
-            }
             else {
                 state = 'live';
             }