@webex/web-client-media-engine 1.40.0 → 1.40.2

package/dist/cjs/index.js

@@ -8979,6 +8979,9 @@ function injectJmpAttributes(parsedSdp, csiMap, streamSignalingMode) {
             mLine.addLine(new JmpStreamIdModeLine(streamSignalingMode));
         }
     });
+}
+function hasSimulcast(av) {
+    return !!av.simulcast || av.ssrcGroups.map((sg) => sg.semantics).some((sem) => sem === 'SIM');
 }
 
 class SendOnlyTransceiver extends Transceiver {
@@ -9702,10 +9705,6 @@ const defaultMultistreamConnectionOptions = {
     enableMainAudio: true,
     enableMainVideo: true,
 };
-const defaultVideoCodecParameters = {
-    'max-mbps': `${defaultMaxVideoEncodeMbps}`,
-    'max-fs': `${defaultMaxVideoEncodeFrameSize}`,
-};
 class MultistreamConnection extends EventEmitter {
     constructor(userOptions = {}) {
         var _a, _b;
@@ -9729,7 +9728,6 @@ class MultistreamConnection extends EventEmitter {
         const mainSceneId = generateSceneId();
         const videoMainEncodingOptions = this.getVideoEncodingOptions(MediaContent.Main);
         this.createSendTransceiver(MediaType.VideoMain, mainSceneId, videoMainEncodingOptions);
-        this.setCodecParameters(MediaType.VideoMain, defaultVideoCodecParameters);
         this.createSendTransceiver(MediaType.AudioMain, mainSceneId);
         (_a = this.sendTransceivers.get(MediaType.VideoMain)) === null || _a === void 0 ? void 0 : _a.setActive(this.options.enableMainVideo);
         (_b = this.sendTransceivers.get(MediaType.AudioMain)) === null || _b === void 0 ? void 0 : _b.setActive(this.options.enableMainAudio);
@@ -9737,7 +9735,6 @@ class MultistreamConnection extends EventEmitter {
             const videoPresentationEncodingOptions = this.getVideoEncodingOptions(MediaContent.Slides);
             const contentSceneId = generateSceneId();
             this.createSendTransceiver(MediaType.VideoSlides, contentSceneId, videoPresentationEncodingOptions);
-            this.setCodecParameters(MediaType.VideoSlides, defaultVideoCodecParameters);
             this.createSendTransceiver(MediaType.AudioSlides, contentSceneId);
         }
     }
@@ -9856,9 +9853,11 @@ class MultistreamConnection extends EventEmitter {
         this.jmpSessions.set(mediaType, jmpSession);
     }
     sendSourceWarnings(mediaType, requests) {
+        var _a;
         if (getMediaFamily(mediaType) === MediaFamily.Video) {
             const sendTransceiver = this.getSendTransceiverOrThrow(mediaType);
             const signaler = this.streamSignalerManager.getEgressStreamSignalerOrThrow(sendTransceiver.mid);
+            const activeSimulcastLayerNumber = ((_a = sendTransceiver.publishedTrack) === null || _a === void 0 ? void 0 : _a.getNumActiveSimulcastLayers()) || 0;
             const sourceWarnings = [];
             requests.forEach(({ ids, policySpecificInfo }) => {
                 ids.forEach((id) => {
@@ -9869,6 +9868,9 @@ class MultistreamConnection extends EventEmitter {
                     else if (!signaler.getSenderIds().some((validId) => compareStreamIds(id, validId))) {
                         sourceWarnings.push({ id, state: 'invalid source', csi: sendTransceiver.csi });
                     }
+                    else if (signaler.getEncodingIndexForStreamId(id) > activeSimulcastLayerNumber) {
+                        sourceWarnings.push({ id, state: 'no source', csi: sendTransceiver.csi });
+                    }
                 });
             });
             if (sourceWarnings.length > 0) {
@@ -10043,21 +10045,20 @@ class MultistreamConnection extends EventEmitter {
         });
     }
     addTrackListeners(mediaType, track) {
+        const onTrackResolutionChange = () => {
+            const sources = this.getVideoSources(mediaType);
+            if (sources != null) {
+                this.sendSourceIndication(mediaType, 1, sources);
+            }
+        };
+        track.on(LocalTrack.Events.TrackConstraintsChange, onTrackResolutionChange);
         const onTrackMute = (event) => {
-            const sendTransceiver = this.getSendTransceiverOrThrow(mediaType);
-            const signaler = this.streamSignalerManager.getEgressStreamSignaler(sendTransceiver.mid);
-            if (!signaler) {
-                return;
+            if (getMediaFamily(mediaType) === MediaFamily.Audio) {
+                this.sendSourceIndication(mediaType, +!event.trackState.muted);
             }
-            if (this.getPublishedTracks().includes(track)) {
-                if (getMediaFamily(mediaType) === MediaFamily.Audio) {
-                    this.sendSourceIndication(mediaType, +!event.trackState.muted);
-                }
-                else {
-                    const state = event.trackState.muted ? 'avatar' : 'live';
-                    const sources = signaler
-                        .getSenderIds()
-                        .map((id) => ({ id, state, csi: sendTransceiver.csi }));
+            else {
+                const sources = this.getVideoSources(mediaType);
+                if (sources != null) {
                     this.sendSourceIndication(mediaType, +!event.trackState.muted, sources);
                 }
             }
@@ -10067,27 +10068,47 @@ class MultistreamConnection extends EventEmitter {
             if (!event.isPublished) {
                 track.off(LocalTrack.Events.Muted, onTrackMute);
                 track.off(LocalTrack.Events.PublishedStateUpdate, onTrackPublish);
+                track.off(LocalTrack.Events.TrackConstraintsChange, onTrackResolutionChange);
             }
-            const sendTransceiver = this.getSendTransceiverOrThrow(mediaType);
-            const signaler = this.streamSignalerManager.getEgressStreamSignaler(sendTransceiver.mid);
-            if (!signaler) {
-                return;
+            if (getMediaFamily(mediaType) === MediaFamily.Audio) {
+                this.sendSourceIndication(mediaType, +event.isPublished);
             }
-            if (!event.trackState.muted) {
-                if (getMediaFamily(mediaType) === MediaFamily.Audio) {
-                    this.sendSourceIndication(mediaType, +event.isPublished);
-                }
-                else {
-                    const state = event.isPublished ? 'live' : 'no source';
-                    const sources = signaler
-                        .getSenderIds()
-                        .map((id) => ({ id, state, csi: sendTransceiver.csi }));
+            else {
+                const sources = this.getVideoSources(mediaType);
+                if (sources != null) {
                     this.sendSourceIndication(mediaType, +event.isPublished, sources);
                 }
             }
         };
         track.on(LocalTrack.Events.PublishedStateUpdate, onTrackPublish);
     }
+    getVideoSources(mediaType) {
+        var _a, _b, _c;
+        const sendTransceiver = this.getSendTransceiverOrThrow(mediaType);
+        const signaler = this.streamSignalerManager.getEgressStreamSignaler(sendTransceiver.mid);
+        if (!signaler) {
+            return null;
+        }
+        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;
+        return signaler.getSenderIds().map((id) => {
+            let state;
+            if (!published) {
+                state = 'no source';
+            }
+            else if (muted) {
+                state = 'avatar';
+            }
+            else if (activeSimulcastLayerNumber <= signaler.getEncodingIndexForStreamId(id)) {
+                state = 'no source';
+            }
+            else {
+                state = 'live';
+            }
+            return { id, state, csi: sendTransceiver.csi };
+        });
+    }
     createReceiveSlot(mediaType) {
         return __awaiter(this, void 0, void 0, function* () {
             const rtcRtpTransceiver = this.pc.addTransceiver(toMediaStreamTrackKind(mediaType), {
@@ -10211,9 +10232,17 @@ class MultistreamConnection extends EventEmitter {
             .filter((av) => av.direction === 'sendrecv')
             .forEach((av) => {
             const egressSignaler = this.streamSignalerManager.getOrCreateEgressStreamSignaler(av.mid);
-            const simulcastEnabled = !!av.simulcast;
+            const simulcastEnabled = hasSimulcast(av);
             const rtxEnabled = av.type === 'video';
             egressSignaler.signalStreams(simulcastEnabled, rtxEnabled, av);
+            if (av.type === 'video') {
+                [...av.codecs.values()]
+                    .filter((ci) => ci.name === 'H264')
+                    .forEach((ci) => {
+                    ci.fmtParams.set('max-mbps', `${defaultMaxVideoEncodeMbps}`);
+                    ci.fmtParams.set('max-fs', `${defaultMaxVideoEncodeFrameSize}`);
+                });
+            }
             const mediaType = [...this.sendTransceivers.keys()].find((key) => { var _a; return ((_a = this.sendTransceivers.get(key)) === null || _a === void 0 ? void 0 : _a.mid) === av.mid; });
             if (mediaType && this.customCodecParameters.has(mediaType)) {
                 [...av.codecs.values()]