@webex/web-client-media-engine 1.40.4 → 1.40.5

package/dist/cjs/index.js

@@ -547,12 +547,13 @@ function createMicrophoneTrack(constructor, constraints) {
  * Creates a display video track.
  *
  * @param constructor - Constructor for the local display track.
+ * @param videoContentHint - An optional parameters to give a hint for the content of the track.
  * @returns A Promise that resolves to a LocalDisplayTrack.
  */
-function createDisplayTrack(constructor) {
+function createDisplayTrack(constructor, videoContentHint) {
     return __awaiter$1(this, void 0, void 0, function* () {
         const stream = yield getDisplayMedia({ video: true });
-        return new constructor(stream);
+        return new constructor(stream, videoContentHint);
     });
 }
 /**
@@ -1358,6 +1359,25 @@ class LocalCameraTrack extends LocalTrack {
  * Represents a local track for a display source.
  */
 class LocalDisplayTrack extends LocalTrack {
+    /**
+     * Create a LocalDisplayTrack from the given values.
+     *
+     * @param stream - The MediaStream for this track.
+     * @param videoContentHint - An optional content hint, describing the content of the track.
+     */
+    constructor(stream, videoContentHint) {
+        super(stream);
+        this._videoContentHint = videoContentHint;
+        this.underlyingTrack.contentHint = videoContentHint || '';
+    }
+    /**
+     * Get the VideoContentHint for this track.
+     *
+     * @returns The VideoContentHint for this track.
+     */
+    get videoContentHint() {
+        return this._videoContentHint;
+    }
 }
 
 /**
@@ -5709,11 +5729,12 @@ function compareStreamIds(id1, id2) {
 }
 
 class SourceIndicationMsg {
-    constructor(seqNum, numTotalSources, numLiveSources, sources) {
+    constructor(seqNum, numTotalSources, numLiveSources, sources, videoContentHint) {
         this.seqNum = seqNum;
         this.numTotalSources = numTotalSources;
         this.numLiveSources = numLiveSources;
         this.sources = sources;
+        this.videoContentHint = videoContentHint;
     }
     sourcesToString() {
         return this.sources
@@ -5809,13 +5830,13 @@ class JmpSession extends events$2.EventEmitter {
             this.logger.warn(`Retransmits for message expired: ${expiredJmpMsg}`);
         });
     }
-    updateSourceIndication(numTotalSources, numLiveSources, sources) {
+    updateSourceIndication(numTotalSources, numLiveSources, sources, videoContentHint) {
         var _a;
         const filteredSources = sources.filter((source) => {
             var _a;
             return (_a = this.lastReceivedScr) === null || _a === void 0 ? void 0 : _a.requests.some((req) => req.ids.find((streamId) => compareStreamIds(streamId, source.id)));
         });
-        const sourceIndicationMsg = new SourceIndicationMsg(this.currSourceIndicationSeqNum++, numTotalSources, numLiveSources, filteredSources);
+        const sourceIndicationMsg = new SourceIndicationMsg(this.currSourceIndicationSeqNum++, numTotalSources, numLiveSources, filteredSources, videoContentHint);
         const jmpMsg = new JmpMsg(this.mediaFamily, this.mediaContent, {
             msgType: JmpMsgType.SourceIndication,
             payload: sourceIndicationMsg,
@@ -9201,23 +9222,58 @@ class SsrcEgressStreamSignaler {
         this.streamIds = [];
     }
     signalStreams(simulcastEnabled, rtxEnabled, mLine) {
+        var _a;
         mLine.rids = [];
         mLine.simulcast = undefined;
-        mLine.ssrcs = [];
-        mLine.ssrcGroups = [];
         mLine.extMaps = mLine.extMaps.filter((extMapLine) => !/^urn:ietf:params:rtp-hdrext:sdes:(?:mid|rtp-stream-id|repaired-rtp-stream-id)$/.test(extMapLine.uri));
-        if (this.streamIds.length === 0) {
-            const numStreams = simulcastEnabled ? 3 : 1;
-            [...Array(numStreams).keys()].forEach(() => {
-                const newStreamId = {
-                    ssrc: generateSsrc(),
-                };
-                if (rtxEnabled) {
-                    newStreamId.rtxSsrc = generateSsrc();
+        const numStreams = simulcastEnabled ? 3 : 1;
+        if (!this.streamIds.length) {
+            if (mLine.ssrcs.length) {
+                const ssrcs = [...new Set(mLine.ssrcs.map((ssrcLine) => ssrcLine.ssrcId))];
+                mLine.ssrcGroups.forEach((sg) => {
+                    if (!sg.ssrcs.every((ssrc) => ssrcs.includes(ssrc))) {
+                        throw new Error('SSRC present in SSRC groups is missing from SSRC lines');
+                    }
+                });
+                const rtxSsrcGroups = mLine.ssrcGroups.filter((sg) => sg.semantics === 'FID');
+                if (rtxSsrcGroups.length && rtxSsrcGroups.length !== numStreams) {
+                    throw new Error(`Expect ${numStreams} RTX SSRC groups, got ${rtxSsrcGroups.length}`);
                 }
-                this.streamIds.push(newStreamId);
-            });
+                rtxSsrcGroups.forEach((sg) => {
+                    this.streamIds.push({
+                        ssrc: sg.ssrcs[0],
+                        rtxSsrc: sg.ssrcs[1],
+                    });
+                });
+                const simulcastSsrcs = (_a = mLine.ssrcGroups.find((sg) => sg.semantics === 'SIM')) === null || _a === void 0 ? void 0 : _a.ssrcs;
+                if (simulcastSsrcs) {
+                    if (simulcastSsrcs.length !== numStreams ||
+                        !this.streamIds.every((streamId) => simulcastSsrcs.includes(streamId.ssrc))) {
+                        throw new Error('SSRCs in simulcast SSRC group do not match primary SSRCs in RTX SSRC groups');
+                    }
+                    this.streamIds.sort((a, b) => simulcastSsrcs.indexOf(a.ssrc) - simulcastSsrcs.indexOf(b.ssrc));
+                }
+                else if (rtxSsrcGroups.length > 1) {
+                    throw new Error('Multiple RTX SSRC groups but no simulcast SSRC group found');
+                }
+                if (!this.streamIds.length) {
+                    this.streamIds.push({ ssrc: ssrcs[0] });
+                }
+            }
+            else {
+                [...Array(numStreams).keys()].forEach(() => {
+                    const newStreamId = {
+                        ssrc: generateSsrc(),
+                    };
+                    if (rtxEnabled) {
+                        newStreamId.rtxSsrc = generateSsrc();
+                    }
+                    this.streamIds.push(newStreamId);
+                });
+            }
         }
+        mLine.ssrcs = [];
+        mLine.ssrcGroups = [];
         this.streamIds.forEach((streamId) => {
             const rtpSsrc = streamId.ssrc;
             mLine.addLine(new SsrcLine(rtpSsrc, 'cname', `${rtpSsrc}-cname`));
@@ -9685,6 +9741,15 @@ function toMediaStreamTrackKind(mediaType) {
         ? exports.MediaStreamTrackKind.Video
         : exports.MediaStreamTrackKind.Audio;
 }
+function webRtcVideoContentHintToJmpVideoContentHint(hint) {
+    if (hint === 'motion') {
+        return 'motion';
+    }
+    if (hint === 'detail') {
+        return 'sharpness';
+    }
+    return undefined;
+}
 function toMediaFamily(kind) {
     if (kind === exports.MediaStreamTrackKind.Video) {
         return MediaFamily.Video;
@@ -9933,24 +9998,8 @@ class MultistreamConnection extends EventEmitter {
         const dataChannel = this.pc.createDataChannel('datachannel', {});
         dataChannel.onopen = (e) => {
             logger.info('DataChannel opened: ', e);
-            this.sendTransceivers.forEach((transceiver, mediaType) => {
-                const track = transceiver.publishedTrack;
-                if (track) {
-                    if (getMediaFamily(mediaType) === MediaFamily.Audio) {
-                        this.sendSourceIndication(mediaType, +!track.muted);
-                    }
-                    else {
-                        const signaler = this.streamSignalerManager.getEgressStreamSignalerOrThrow(transceiver.mid);
-                        const state = track.muted ? 'avatar' : 'live';
-                        const sources = signaler
-                            .getSenderIds()
-                            .map((id) => ({ id, state, csi: transceiver.csi }));
-                        this.sendSourceIndication(mediaType, +!track.muted, sources);
-                    }
-                }
-                else {
-                    this.sendSourceIndication(mediaType, 0);
-                }
+            [...this.sendTransceivers.keys()].forEach((mediaType) => {
+                this.maybeSendSourceIndication(mediaType);
             });
             logger.info(`Flushing pending JMP task queue`);
             this.pendingJmpTasks.forEach((t) => t());
@@ -9999,11 +10048,31 @@ class MultistreamConnection extends EventEmitter {
         });
         this.pc.close();
     }
-    sendSourceIndication(mediaType, numLiveSources, sources = []) {
+    maybeSendSourceIndication(mediaType) {
+        var _a;
+        const transceiver = this.getSendTransceiverOrThrow(mediaType);
+        const numLiveSources = ((_a = transceiver.publishedTrack) === null || _a === void 0 ? void 0 : _a.muted) === false ? 1 : 0;
+        if (getMediaFamily(mediaType) === MediaFamily.Video) {
+            const sources = this.getVideoSources(mediaType);
+            if (sources === null) {
+                return;
+            }
+            let webRtcVideoContentHint;
+            if (transceiver.publishedTrack instanceof LocalDisplayTrack) {
+                webRtcVideoContentHint = transceiver.publishedTrack.videoContentHint;
+            }
+            this.sendSourceIndication(mediaType, numLiveSources, sources, webRtcVideoContentHintToJmpVideoContentHint(webRtcVideoContentHint));
+        }
+        else {
+            this.sendSourceIndication(mediaType, numLiveSources);
+        }
+    }
+    sendSourceIndication(mediaType, numLiveSources, sources = [], videoContentHint = undefined) {
         var _a;
         const task = () => {
             var _a;
-            (_a = this.jmpSessions.get(mediaType)) === null || _a === void 0 ? void 0 : _a.updateSourceIndication(1, numLiveSources, sources);
+            (_a = this.jmpSessions
+                .get(mediaType)) === null || _a === void 0 ? void 0 : _a.updateSourceIndication(1, numLiveSources, sources, videoContentHint);
         };
         if (((_a = this.dataChannel) === null || _a === void 0 ? void 0 : _a.readyState) === 'open') {
             task();
@@ -10048,24 +10117,9 @@ class MultistreamConnection extends EventEmitter {
         });
     }
     addTrackListeners(mediaType, track) {
-        const onTrackResolutionChange = () => {
-            const sources = this.getVideoSources(mediaType);
-            if (sources != null) {
-                this.sendSourceIndication(mediaType, 1, sources);
-            }
-        };
+        const onTrackResolutionChange = () => this.maybeSendSourceIndication(mediaType);
         track.on(LocalTrack.Events.TrackConstraintsChange, onTrackResolutionChange);
-        const onTrackMute = (event) => {
-            if (getMediaFamily(mediaType) === MediaFamily.Audio) {
-                this.sendSourceIndication(mediaType, +!event.trackState.muted);
-            }
-            else {
-                const sources = this.getVideoSources(mediaType);
-                if (sources != null) {
-                    this.sendSourceIndication(mediaType, +!event.trackState.muted, sources);
-                }
-            }
-        };
+        const onTrackMute = () => this.maybeSendSourceIndication(mediaType);
         track.on(LocalTrack.Events.Muted, onTrackMute);
         const onTrackPublish = (event) => {
             if (!event.isPublished) {
@@ -10073,14 +10127,8 @@ class MultistreamConnection extends EventEmitter {
                 track.off(LocalTrack.Events.PublishedStateUpdate, onTrackPublish);
                 track.off(LocalTrack.Events.TrackConstraintsChange, onTrackResolutionChange);
             }
-            if (getMediaFamily(mediaType) === MediaFamily.Audio) {
-                this.sendSourceIndication(mediaType, +event.isPublished);
-            }
-            else {
-                const sources = this.getVideoSources(mediaType);
-                if (sources != null) {
-                    this.sendSourceIndication(mediaType, +event.isPublished, sources);
-                }
+            if (!track.muted) {
+                this.maybeSendSourceIndication(mediaType);
             }
         };
         track.on(LocalTrack.Events.PublishedStateUpdate, onTrackPublish);