@webex/internal-media-core 1.35.5 → 1.35.7

package/dist/cjs/index.js

@@ -4679,6 +4679,139 @@ var media = /*#__PURE__*/Object.freeze({
   checkDevicePermissions: checkDevicePermissions,
   ensureDevicePermissions: ensureDevicePermissions
 });
+var ErrorTypes;
+(function (ErrorTypes) {
+  ErrorTypes["DEVICE_PERMISSION_DENIED"] = "DEVICE_PERMISSION_DENIED";
+  ErrorTypes["CREATE_CAMERA_TRACK_FAILED"] = "CREATE_CAMERA_TRACK_FAILED";
+  ErrorTypes["CREATE_MICROPHONE_TRACK_FAILED"] = "CREATE_MICROPHONE_TRACK_FAILED";
+})(ErrorTypes || (ErrorTypes = {}));
+/**
+ * Represents a WCME error, which contains error type and error message.
+ */
+class WcmeError {
+  /**
+   * Creates new error.
+   *
+   * @param type - Error type.
+   * @param message - Error message.
+   */
+  constructor(type) {
+    var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+    this.type = type;
+    this.message = message;
+  }
+}
+/**
+ * Creates a camera video track. Please note that the constraint params in second getUserMedia call would NOT take effect when:
+ *
+ * 1. Previous captured video track from the same device is not stopped .
+ * 2. Previous createCameraTrack() call for the same device is in progress.
+ *
+ * @param constructor - Constructor for the local camera track.
+ * @param constraints - Video device constraints.
+ * @returns A LocalTrack object or an error.
+ */
+function createCameraTrack(constructor, constraints) {
+  return __awaiter$1(this, void 0, void 0, function* () {
+    var stream;
+    try {
+      stream = yield getUserMedia({
+        video: Object.assign({}, constraints)
+      });
+    } catch (error) {
+      throw new WcmeError(ErrorTypes.CREATE_CAMERA_TRACK_FAILED, "Failed to create camera track ".concat(error));
+    }
+    return new constructor(stream);
+  });
+}
+/**
+ * Creates a microphone audio track.
+ *
+ * @param constructor - Constructor for the local microphone track.
+ * @param constraints - Audio device constraints.
+ * @returns A LocalTrack object or an error.
+ */
+function createMicrophoneTrack(constructor, constraints) {
+  return __awaiter$1(this, void 0, void 0, function* () {
+    var stream;
+    try {
+      stream = yield getUserMedia({
+        audio: Object.assign({}, constraints)
+      });
+    } catch (error) {
+      throw new WcmeError(ErrorTypes.CREATE_MICROPHONE_TRACK_FAILED, "Failed to create microphone track ".concat(error));
+    }
+    return new constructor(stream);
+  });
+}
+/**
+ * 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, videoContentHint) {
+  return __awaiter$1(this, void 0, void 0, function* () {
+    var stream = yield getDisplayMedia({
+      video: true
+    });
+    return new constructor(stream, videoContentHint);
+  });
+}
+/**
+ * Enumerates the media input and output devices available.
+ *
+ * @param deviceKind - Optional filter to return a specific device kind.
+ * @returns List of media devices in an array of MediaDeviceInfo objects.
+ */
+function getDevices(deviceKind) {
+  return __awaiter$1(this, void 0, void 0, function* () {
+    var devices;
+    try {
+      devices = yield ensureDevicePermissions([DeviceKind.AudioInput, DeviceKind.VideoInput], enumerateDevices);
+    } catch (error) {
+      throw new WcmeError(ErrorTypes.DEVICE_PERMISSION_DENIED, 'Failed to ensure device permissions');
+    }
+    return devices.filter(v => deviceKind ? v.kind === deviceKind : true);
+  });
+}
+/**
+ * Helper function to get a list of microphone devices.
+ *
+ * @returns List of microphone devices in an array of MediaDeviceInfo objects.
+ */
+function getAudioInputDevices() {
+  return __awaiter$1(this, void 0, void 0, function* () {
+    return getDevices(DeviceKind.AudioInput);
+  });
+}
+/**
+ * Helper function to get a list of speaker devices.
+ *
+ * @returns List of speaker devices in an array of MediaDeviceInfo objects.
+ */
+function getAudioOutputDevices() {
+  return __awaiter$1(this, void 0, void 0, function* () {
+    return getDevices(DeviceKind.AudioOutput);
+  });
+}
+/**
+ * Helper function to get a list of camera devices.
+ *
+ * @returns List of camera devices in an array of MediaDeviceInfo objects.
+ */
+function getVideoInputDevices() {
+  return __awaiter$1(this, void 0, void 0, function* () {
+    return getDevices(DeviceKind.VideoInput);
+  });
+}
+/**
+ * Export the setOnDeviceChangeHandler method directly from the core lib.
+ */
+var {
+  setOnDeviceChangeHandler
+} = media;
 var events$1 = {
   exports: {}
 };
@@ -5351,141 +5484,32 @@ class LocalCameraTrack extends LocalTrack {}
 /**
  * Represents a local track for a display source.
  */
-class LocalDisplayTrack extends LocalTrack {}
-
-/**
- * Represents a local track for a microphone source.
- */
-class LocalMicrophoneTrack extends LocalTrack {}
-var ErrorTypes;
-(function (ErrorTypes) {
-  ErrorTypes["DEVICE_PERMISSION_DENIED"] = "DEVICE_PERMISSION_DENIED";
-  ErrorTypes["CREATE_CAMERA_TRACK_FAILED"] = "CREATE_CAMERA_TRACK_FAILED";
-  ErrorTypes["CREATE_MICROPHONE_TRACK_FAILED"] = "CREATE_MICROPHONE_TRACK_FAILED";
-})(ErrorTypes || (ErrorTypes = {}));
-/**
- * Represents a WCME error, which contains error type and error message.
- */
-class WcmeError {
+class LocalDisplayTrack extends LocalTrack {
   /**
-   * Creates new error.
+   * Create a LocalDisplayTrack from the given values.
    *
-   * @param type - Error type.
-   * @param message - Error message.
+   * @param stream - The MediaStream for this track.
+   * @param videoContentHint - An optional content hint, describing the content of the track.
    */
-  constructor(type) {
-    var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-    this.type = type;
-    this.message = message;
+  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;
   }
 }
+
 /**
- * Creates a camera video track. Please note that the constraint params in second getUserMedia call would NOT take effect when:
- *
- * 1. Previous captured video track from the same device is not stopped .
- * 2. Previous createCameraTrack() call for the same device is in progress.
- *
- * @param constraints - Video device constraints.
- * @returns A LocalTrack object or an error.
- */
-function createCameraTrack(constraints) {
-  return __awaiter$1(this, void 0, void 0, function* () {
-    var stream;
-    try {
-      stream = yield getUserMedia({
-        video: Object.assign({}, constraints)
-      });
-    } catch (error) {
-      throw new WcmeError(ErrorTypes.CREATE_CAMERA_TRACK_FAILED, "Failed to create camera track ".concat(error));
-    }
-    return new LocalCameraTrack(stream);
-  });
-}
-/**
- * Creates a microphone audio track.
- *
- * @param constraints - Audio device constraints.
- * @returns A LocalTrack object or an error.
- */
-function createMicrophoneTrack(constraints) {
-  return __awaiter$1(this, void 0, void 0, function* () {
-    var stream;
-    try {
-      stream = yield getUserMedia({
-        audio: Object.assign({}, constraints)
-      });
-    } catch (error) {
-      throw new WcmeError(ErrorTypes.CREATE_MICROPHONE_TRACK_FAILED, "Failed to create microphone track ".concat(error));
-    }
-    return new LocalMicrophoneTrack(stream);
-  });
-}
-/**
- * Creates a display video track.
- *
- * @returns A Promise that resolves to a LocalDisplayTrack.
- */
-function createDisplayTrack() {
-  return __awaiter$1(this, void 0, void 0, function* () {
-    var stream = yield getDisplayMedia({
-      video: true
-    });
-    return new LocalDisplayTrack(stream);
-  });
-}
-/**
- * Enumerates the media input and output devices available.
- *
- * @param deviceKind - Optional filter to return a specific device kind.
- * @returns List of media devices in an array of MediaDeviceInfo objects.
- */
-function getDevices(deviceKind) {
-  return __awaiter$1(this, void 0, void 0, function* () {
-    var devices;
-    try {
-      devices = yield ensureDevicePermissions([DeviceKind.AudioInput, DeviceKind.VideoInput], enumerateDevices);
-    } catch (error) {
-      throw new WcmeError(ErrorTypes.DEVICE_PERMISSION_DENIED, 'Failed to ensure device permissions');
-    }
-    return devices.filter(v => deviceKind ? v.kind === deviceKind : true);
-  });
-}
-/**
- * Helper function to get a list of microphone devices.
- *
- * @returns List of microphone devices in an array of MediaDeviceInfo objects.
- */
-function getAudioInputDevices() {
-  return __awaiter$1(this, void 0, void 0, function* () {
-    return getDevices(DeviceKind.AudioInput);
-  });
-}
-/**
- * Helper function to get a list of speaker devices.
- *
- * @returns List of speaker devices in an array of MediaDeviceInfo objects.
- */
-function getAudioOutputDevices() {
-  return __awaiter$1(this, void 0, void 0, function* () {
-    return getDevices(DeviceKind.AudioOutput);
-  });
-}
-/**
- * Helper function to get a list of camera devices.
- *
- * @returns List of camera devices in an array of MediaDeviceInfo objects.
- */
-function getVideoInputDevices() {
-  return __awaiter$1(this, void 0, void 0, function* () {
-    return getDevices(DeviceKind.VideoInput);
-  });
-}
-/**
- * Export the setOnDeviceChangeHandler method directly from the core lib.
+ * Represents a local track for a microphone source.
  */
-var {
-  setOnDeviceChangeHandler
-} = media;
+class LocalMicrophoneTrack extends LocalTrack {}
 
 // Overall connection state (based on the ICE and DTLS connection states)
 exports.ConnectionState = void 0;
@@ -9480,11 +9504,12 @@ function compareStreamIds(id1, id2) {
   return keys1.every(key => id1[key] === id2[key]);
 }
 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.map(source => "Source(id=".concat(source.id, " state=").concat(source.state, " ").concat(source.csi ? "csi=".concat(source.csi) : '', ")")).join(', ');
@@ -9571,13 +9596,13 @@ class JmpSession extends EventEmitter$4 {
       this.logger.warn("Retransmits for message expired: ".concat(expiredJmpMsg));
     });
   }
-  updateSourceIndication(numTotalSources, numLiveSources, sources) {
+  updateSourceIndication(numTotalSources, numLiveSources, sources, videoContentHint) {
     var _a;
     var 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)));
     });
-    var sourceIndicationMsg = new SourceIndicationMsg(this.currSourceIndicationSeqNum++, numTotalSources, numLiveSources, filteredSources);
+    var sourceIndicationMsg = new SourceIndicationMsg(this.currSourceIndicationSeqNum++, numTotalSources, numLiveSources, filteredSources, videoContentHint);
     var jmpMsg = new JmpMsg(this.mediaFamily, this.mediaContent, {
       msgType: JmpMsgType$1.SourceIndication,
       payload: sourceIndicationMsg
@@ -12722,7 +12747,9 @@ class SsrcIngressStreamSignaler {
     mLine.addLine(new SsrcLine(this.ssrc, 'cname', "".concat(this.ssrc, "-cname")));
     mLine.addLine(new SsrcLine(this.ssrc, 'msid', '-', '1'));
     if (hasCodec('rtx', mLine)) {
-      this.rtxSsrc = generateSsrc();
+      if (!this.rtxSsrc) {
+        this.rtxSsrc = generateSsrc();
+      }
       mLine.addLine(new SsrcLine(this.rtxSsrc, 'cname', "".concat(this.ssrc, "-cname")));
       mLine.addLine(new SsrcLine(this.rtxSsrc, 'msid', '-', '1'));
       mLine.addLine(new SsrcGroupLine('FID', [this.ssrc, this.rtxSsrc]));
@@ -12734,23 +12761,57 @@ 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) {
-      var numStreams = simulcastEnabled ? 3 : 1;
-      [...Array(numStreams).keys()].forEach(() => {
-        var newStreamId = {
-          ssrc: generateSsrc()
-        };
-        if (rtxEnabled) {
-          newStreamId.rtxSsrc = generateSsrc();
+    var numStreams = simulcastEnabled ? 3 : 1;
+    if (!this.streamIds.length) {
+      if (mLine.ssrcs.length) {
+        var 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');
+          }
+        });
+        var rtxSsrcGroups = mLine.ssrcGroups.filter(sg => sg.semantics === 'FID');
+        if (rtxSsrcGroups.length && rtxSsrcGroups.length !== numStreams) {
+          throw new Error("Expect ".concat(numStreams, " RTX SSRC groups, got ").concat(rtxSsrcGroups.length));
         }
-        this.streamIds.push(newStreamId);
-      });
+        rtxSsrcGroups.forEach(sg => {
+          this.streamIds.push({
+            ssrc: sg.ssrcs[0],
+            rtxSsrc: sg.ssrcs[1]
+          });
+        });
+        var 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(() => {
+          var newStreamId = {
+            ssrc: generateSsrc()
+          };
+          if (rtxEnabled) {
+            newStreamId.rtxSsrc = generateSsrc();
+          }
+          this.streamIds.push(newStreamId);
+        });
+      }
     }
+    mLine.ssrcs = [];
+    mLine.ssrcGroups = [];
     this.streamIds.forEach(streamId => {
       var rtpSsrc = streamId.ssrc;
       mLine.addLine(new SsrcLine(rtpSsrc, 'cname', "".concat(rtpSsrc, "-cname")));
@@ -14505,6 +14566,15 @@ function setLogHandler(logHandler) {
 function toMediaStreamTrackKind(mediaType) {
   return [MediaType.VideoMain, MediaType.VideoSlides].includes(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;
@@ -14700,7 +14770,7 @@ class MultistreamConnection extends EventEmitter {
               state: 'invalid source',
               csi: sendTransceiver.csi
             });
-          } else if (signaler.getEncodingIndexForStreamId(id) > activeSimulcastLayerNumber) {
+          } else if (signaler.getEncodingIndexForStreamId(id) >= activeSimulcastLayerNumber) {
             sourceWarnings.push({
               id,
               state: 'no source',
@@ -14770,24 +14840,8 @@ class MultistreamConnection extends EventEmitter {
     var dataChannel = this.pc.createDataChannel('datachannel', {});
     dataChannel.onopen = e => {
       logger$4.info('DataChannel opened: ', e);
-      this.sendTransceivers.forEach((transceiver, mediaType) => {
-        var track = transceiver.publishedTrack;
-        if (track) {
-          if (getMediaFamily$1(mediaType) === MediaFamily.Audio) {
-            this.sendSourceIndication(mediaType, +!track.muted);
-          } else {
-            var signaler = this.streamSignalerManager.getEgressStreamSignalerOrThrow(transceiver.mid);
-            var state = track.muted ? 'avatar' : 'live';
-            var 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$4.info("Flushing pending JMP task queue");
       this.pendingJmpTasks.forEach(t => t());
@@ -14835,12 +14889,31 @@ class MultistreamConnection extends EventEmitter {
     });
     this.pc.close();
   }
+  maybeSendSourceIndication(mediaType) {
+    var _a;
+    var transceiver = this.getSendTransceiverOrThrow(mediaType);
+    var numLiveSources = ((_a = transceiver.publishedTrack) === null || _a === void 0 ? void 0 : _a.muted) === false ? 1 : 0;
+    if (getMediaFamily$1(mediaType) === MediaFamily.Video) {
+      var sources = this.getVideoSources(mediaType);
+      if (sources === null) {
+        return;
+      }
+      var 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) {
     var sources = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+    var videoContentHint = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : undefined;
     var _a;
     var 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();
@@ -14882,23 +14955,9 @@ class MultistreamConnection extends EventEmitter {
     });
   }
   addTrackListeners(mediaType, track) {
-    var onTrackResolutionChange = () => {
-      var sources = this.getVideoSources(mediaType);
-      if (sources != null) {
-        this.sendSourceIndication(mediaType, 1, sources);
-      }
-    };
+    var onTrackResolutionChange = () => this.maybeSendSourceIndication(mediaType);
     track.on(LocalTrack.Events.TrackConstraintsChange, onTrackResolutionChange);
-    var onTrackMute = event => {
-      if (getMediaFamily$1(mediaType) === MediaFamily.Audio) {
-        this.sendSourceIndication(mediaType, +!event.trackState.muted);
-      } else {
-        var sources = this.getVideoSources(mediaType);
-        if (sources != null) {
-          this.sendSourceIndication(mediaType, +!event.trackState.muted, sources);
-        }
-      }
-    };
+    var onTrackMute = () => this.maybeSendSourceIndication(mediaType);
     track.on(LocalTrack.Events.Muted, onTrackMute);
     var onTrackPublish = event => {
       if (!event.isPublished) {
@@ -14906,13 +14965,8 @@ class MultistreamConnection extends EventEmitter {
         track.off(LocalTrack.Events.PublishedStateUpdate, onTrackPublish);
         track.off(LocalTrack.Events.TrackConstraintsChange, onTrackResolutionChange);
       }
-      if (getMediaFamily$1(mediaType) === MediaFamily.Audio) {
-        this.sendSourceIndication(mediaType, +event.isPublished);
-      } else {
-        var 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);
@@ -15183,7 +15237,7 @@ class MultistreamConnection extends EventEmitter {
   }
   renewPeerConnection(userOptions) {
     if (userOptions) {
-      this.options = Object.assign(Object.assign({}, defaultMultistreamConnectionOptions), userOptions);
+      this.options = Object.assign(Object.assign({}, this.options), userOptions);
     }
     logger$4.info("Renewing multistream connection with options ".concat(JSON.stringify(this.options)));
     this.clearMids();

package/dist/esm/index.js

@@ -4668,6 +4668,139 @@ var media = /*#__PURE__*/Object.freeze({
   checkDevicePermissions: checkDevicePermissions,
   ensureDevicePermissions: ensureDevicePermissions
 });
+var ErrorTypes;
+(function (ErrorTypes) {
+  ErrorTypes["DEVICE_PERMISSION_DENIED"] = "DEVICE_PERMISSION_DENIED";
+  ErrorTypes["CREATE_CAMERA_TRACK_FAILED"] = "CREATE_CAMERA_TRACK_FAILED";
+  ErrorTypes["CREATE_MICROPHONE_TRACK_FAILED"] = "CREATE_MICROPHONE_TRACK_FAILED";
+})(ErrorTypes || (ErrorTypes = {}));
+/**
+ * Represents a WCME error, which contains error type and error message.
+ */
+class WcmeError {
+  /**
+   * Creates new error.
+   *
+   * @param type - Error type.
+   * @param message - Error message.
+   */
+  constructor(type) {
+    var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+    this.type = type;
+    this.message = message;
+  }
+}
+/**
+ * Creates a camera video track. Please note that the constraint params in second getUserMedia call would NOT take effect when:
+ *
+ * 1. Previous captured video track from the same device is not stopped .
+ * 2. Previous createCameraTrack() call for the same device is in progress.
+ *
+ * @param constructor - Constructor for the local camera track.
+ * @param constraints - Video device constraints.
+ * @returns A LocalTrack object or an error.
+ */
+function createCameraTrack(constructor, constraints) {
+  return __awaiter$1(this, void 0, void 0, function* () {
+    var stream;
+    try {
+      stream = yield getUserMedia({
+        video: Object.assign({}, constraints)
+      });
+    } catch (error) {
+      throw new WcmeError(ErrorTypes.CREATE_CAMERA_TRACK_FAILED, "Failed to create camera track ".concat(error));
+    }
+    return new constructor(stream);
+  });
+}
+/**
+ * Creates a microphone audio track.
+ *
+ * @param constructor - Constructor for the local microphone track.
+ * @param constraints - Audio device constraints.
+ * @returns A LocalTrack object or an error.
+ */
+function createMicrophoneTrack(constructor, constraints) {
+  return __awaiter$1(this, void 0, void 0, function* () {
+    var stream;
+    try {
+      stream = yield getUserMedia({
+        audio: Object.assign({}, constraints)
+      });
+    } catch (error) {
+      throw new WcmeError(ErrorTypes.CREATE_MICROPHONE_TRACK_FAILED, "Failed to create microphone track ".concat(error));
+    }
+    return new constructor(stream);
+  });
+}
+/**
+ * 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, videoContentHint) {
+  return __awaiter$1(this, void 0, void 0, function* () {
+    var stream = yield getDisplayMedia({
+      video: true
+    });
+    return new constructor(stream, videoContentHint);
+  });
+}
+/**
+ * Enumerates the media input and output devices available.
+ *
+ * @param deviceKind - Optional filter to return a specific device kind.
+ * @returns List of media devices in an array of MediaDeviceInfo objects.
+ */
+function getDevices(deviceKind) {
+  return __awaiter$1(this, void 0, void 0, function* () {
+    var devices;
+    try {
+      devices = yield ensureDevicePermissions([DeviceKind.AudioInput, DeviceKind.VideoInput], enumerateDevices);
+    } catch (error) {
+      throw new WcmeError(ErrorTypes.DEVICE_PERMISSION_DENIED, 'Failed to ensure device permissions');
+    }
+    return devices.filter(v => deviceKind ? v.kind === deviceKind : true);
+  });
+}
+/**
+ * Helper function to get a list of microphone devices.
+ *
+ * @returns List of microphone devices in an array of MediaDeviceInfo objects.
+ */
+function getAudioInputDevices() {
+  return __awaiter$1(this, void 0, void 0, function* () {
+    return getDevices(DeviceKind.AudioInput);
+  });
+}
+/**
+ * Helper function to get a list of speaker devices.
+ *
+ * @returns List of speaker devices in an array of MediaDeviceInfo objects.
+ */
+function getAudioOutputDevices() {
+  return __awaiter$1(this, void 0, void 0, function* () {
+    return getDevices(DeviceKind.AudioOutput);
+  });
+}
+/**
+ * Helper function to get a list of camera devices.
+ *
+ * @returns List of camera devices in an array of MediaDeviceInfo objects.
+ */
+function getVideoInputDevices() {
+  return __awaiter$1(this, void 0, void 0, function* () {
+    return getDevices(DeviceKind.VideoInput);
+  });
+}
+/**
+ * Export the setOnDeviceChangeHandler method directly from the core lib.
+ */
+var {
+  setOnDeviceChangeHandler
+} = media;
 var events$1 = {
   exports: {}
 };
@@ -5340,141 +5473,32 @@ class LocalCameraTrack extends LocalTrack {}
 /**
  * Represents a local track for a display source.
  */
-class LocalDisplayTrack extends LocalTrack {}
-
-/**
- * Represents a local track for a microphone source.
- */
-class LocalMicrophoneTrack extends LocalTrack {}
-var ErrorTypes;
-(function (ErrorTypes) {
-  ErrorTypes["DEVICE_PERMISSION_DENIED"] = "DEVICE_PERMISSION_DENIED";
-  ErrorTypes["CREATE_CAMERA_TRACK_FAILED"] = "CREATE_CAMERA_TRACK_FAILED";
-  ErrorTypes["CREATE_MICROPHONE_TRACK_FAILED"] = "CREATE_MICROPHONE_TRACK_FAILED";
-})(ErrorTypes || (ErrorTypes = {}));
-/**
- * Represents a WCME error, which contains error type and error message.
- */
-class WcmeError {
+class LocalDisplayTrack extends LocalTrack {
   /**
-   * Creates new error.
+   * Create a LocalDisplayTrack from the given values.
    *
-   * @param type - Error type.
-   * @param message - Error message.
+   * @param stream - The MediaStream for this track.
+   * @param videoContentHint - An optional content hint, describing the content of the track.
    */
-  constructor(type) {
-    var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-    this.type = type;
-    this.message = message;
+  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;
   }
 }
+
 /**
- * Creates a camera video track. Please note that the constraint params in second getUserMedia call would NOT take effect when:
- *
- * 1. Previous captured video track from the same device is not stopped .
- * 2. Previous createCameraTrack() call for the same device is in progress.
- *
- * @param constraints - Video device constraints.
- * @returns A LocalTrack object or an error.
- */
-function createCameraTrack(constraints) {
-  return __awaiter$1(this, void 0, void 0, function* () {
-    var stream;
-    try {
-      stream = yield getUserMedia({
-        video: Object.assign({}, constraints)
-      });
-    } catch (error) {
-      throw new WcmeError(ErrorTypes.CREATE_CAMERA_TRACK_FAILED, "Failed to create camera track ".concat(error));
-    }
-    return new LocalCameraTrack(stream);
-  });
-}
-/**
- * Creates a microphone audio track.
- *
- * @param constraints - Audio device constraints.
- * @returns A LocalTrack object or an error.
- */
-function createMicrophoneTrack(constraints) {
-  return __awaiter$1(this, void 0, void 0, function* () {
-    var stream;
-    try {
-      stream = yield getUserMedia({
-        audio: Object.assign({}, constraints)
-      });
-    } catch (error) {
-      throw new WcmeError(ErrorTypes.CREATE_MICROPHONE_TRACK_FAILED, "Failed to create microphone track ".concat(error));
-    }
-    return new LocalMicrophoneTrack(stream);
-  });
-}
-/**
- * Creates a display video track.
- *
- * @returns A Promise that resolves to a LocalDisplayTrack.
- */
-function createDisplayTrack() {
-  return __awaiter$1(this, void 0, void 0, function* () {
-    var stream = yield getDisplayMedia({
-      video: true
-    });
-    return new LocalDisplayTrack(stream);
-  });
-}
-/**
- * Enumerates the media input and output devices available.
- *
- * @param deviceKind - Optional filter to return a specific device kind.
- * @returns List of media devices in an array of MediaDeviceInfo objects.
- */
-function getDevices(deviceKind) {
-  return __awaiter$1(this, void 0, void 0, function* () {
-    var devices;
-    try {
-      devices = yield ensureDevicePermissions([DeviceKind.AudioInput, DeviceKind.VideoInput], enumerateDevices);
-    } catch (error) {
-      throw new WcmeError(ErrorTypes.DEVICE_PERMISSION_DENIED, 'Failed to ensure device permissions');
-    }
-    return devices.filter(v => deviceKind ? v.kind === deviceKind : true);
-  });
-}
-/**
- * Helper function to get a list of microphone devices.
- *
- * @returns List of microphone devices in an array of MediaDeviceInfo objects.
- */
-function getAudioInputDevices() {
-  return __awaiter$1(this, void 0, void 0, function* () {
-    return getDevices(DeviceKind.AudioInput);
-  });
-}
-/**
- * Helper function to get a list of speaker devices.
- *
- * @returns List of speaker devices in an array of MediaDeviceInfo objects.
- */
-function getAudioOutputDevices() {
-  return __awaiter$1(this, void 0, void 0, function* () {
-    return getDevices(DeviceKind.AudioOutput);
-  });
-}
-/**
- * Helper function to get a list of camera devices.
- *
- * @returns List of camera devices in an array of MediaDeviceInfo objects.
- */
-function getVideoInputDevices() {
-  return __awaiter$1(this, void 0, void 0, function* () {
-    return getDevices(DeviceKind.VideoInput);
-  });
-}
-/**
- * Export the setOnDeviceChangeHandler method directly from the core lib.
+ * Represents a local track for a microphone source.
  */
-var {
-  setOnDeviceChangeHandler
-} = media;
+class LocalMicrophoneTrack extends LocalTrack {}
 
 // Overall connection state (based on the ICE and DTLS connection states)
 var ConnectionState;
@@ -9469,11 +9493,12 @@ function compareStreamIds(id1, id2) {
   return keys1.every(key => id1[key] === id2[key]);
 }
 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.map(source => "Source(id=".concat(source.id, " state=").concat(source.state, " ").concat(source.csi ? "csi=".concat(source.csi) : '', ")")).join(', ');
@@ -9560,13 +9585,13 @@ class JmpSession extends EventEmitter$4 {
       this.logger.warn("Retransmits for message expired: ".concat(expiredJmpMsg));
     });
   }
-  updateSourceIndication(numTotalSources, numLiveSources, sources) {
+  updateSourceIndication(numTotalSources, numLiveSources, sources, videoContentHint) {
     var _a;
     var 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)));
     });
-    var sourceIndicationMsg = new SourceIndicationMsg(this.currSourceIndicationSeqNum++, numTotalSources, numLiveSources, filteredSources);
+    var sourceIndicationMsg = new SourceIndicationMsg(this.currSourceIndicationSeqNum++, numTotalSources, numLiveSources, filteredSources, videoContentHint);
     var jmpMsg = new JmpMsg(this.mediaFamily, this.mediaContent, {
       msgType: JmpMsgType$1.SourceIndication,
       payload: sourceIndicationMsg
@@ -12711,7 +12736,9 @@ class SsrcIngressStreamSignaler {
     mLine.addLine(new SsrcLine(this.ssrc, 'cname', "".concat(this.ssrc, "-cname")));
     mLine.addLine(new SsrcLine(this.ssrc, 'msid', '-', '1'));
     if (hasCodec('rtx', mLine)) {
-      this.rtxSsrc = generateSsrc();
+      if (!this.rtxSsrc) {
+        this.rtxSsrc = generateSsrc();
+      }
       mLine.addLine(new SsrcLine(this.rtxSsrc, 'cname', "".concat(this.ssrc, "-cname")));
       mLine.addLine(new SsrcLine(this.rtxSsrc, 'msid', '-', '1'));
       mLine.addLine(new SsrcGroupLine('FID', [this.ssrc, this.rtxSsrc]));
@@ -12723,23 +12750,57 @@ 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) {
-      var numStreams = simulcastEnabled ? 3 : 1;
-      [...Array(numStreams).keys()].forEach(() => {
-        var newStreamId = {
-          ssrc: generateSsrc()
-        };
-        if (rtxEnabled) {
-          newStreamId.rtxSsrc = generateSsrc();
+    var numStreams = simulcastEnabled ? 3 : 1;
+    if (!this.streamIds.length) {
+      if (mLine.ssrcs.length) {
+        var 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');
+          }
+        });
+        var rtxSsrcGroups = mLine.ssrcGroups.filter(sg => sg.semantics === 'FID');
+        if (rtxSsrcGroups.length && rtxSsrcGroups.length !== numStreams) {
+          throw new Error("Expect ".concat(numStreams, " RTX SSRC groups, got ").concat(rtxSsrcGroups.length));
         }
-        this.streamIds.push(newStreamId);
-      });
+        rtxSsrcGroups.forEach(sg => {
+          this.streamIds.push({
+            ssrc: sg.ssrcs[0],
+            rtxSsrc: sg.ssrcs[1]
+          });
+        });
+        var 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(() => {
+          var newStreamId = {
+            ssrc: generateSsrc()
+          };
+          if (rtxEnabled) {
+            newStreamId.rtxSsrc = generateSsrc();
+          }
+          this.streamIds.push(newStreamId);
+        });
+      }
     }
+    mLine.ssrcs = [];
+    mLine.ssrcGroups = [];
     this.streamIds.forEach(streamId => {
       var rtpSsrc = streamId.ssrc;
       mLine.addLine(new SsrcLine(rtpSsrc, 'cname', "".concat(rtpSsrc, "-cname")));
@@ -14494,6 +14555,15 @@ function setLogHandler(logHandler) {
 function toMediaStreamTrackKind(mediaType) {
   return [MediaType$1.VideoMain, MediaType$1.VideoSlides].includes(mediaType) ? MediaStreamTrackKind.Video : MediaStreamTrackKind.Audio;
 }
+function webRtcVideoContentHintToJmpVideoContentHint(hint) {
+  if (hint === 'motion') {
+    return 'motion';
+  }
+  if (hint === 'detail') {
+    return 'sharpness';
+  }
+  return undefined;
+}
 function toMediaFamily(kind) {
   if (kind === MediaStreamTrackKind.Video) {
     return MediaFamily$1.Video;
@@ -14689,7 +14759,7 @@ class MultistreamConnection extends EventEmitter {
               state: 'invalid source',
               csi: sendTransceiver.csi
             });
-          } else if (signaler.getEncodingIndexForStreamId(id) > activeSimulcastLayerNumber) {
+          } else if (signaler.getEncodingIndexForStreamId(id) >= activeSimulcastLayerNumber) {
             sourceWarnings.push({
               id,
               state: 'no source',
@@ -14759,24 +14829,8 @@ class MultistreamConnection extends EventEmitter {
     var dataChannel = this.pc.createDataChannel('datachannel', {});
     dataChannel.onopen = e => {
       logger$4.info('DataChannel opened: ', e);
-      this.sendTransceivers.forEach((transceiver, mediaType) => {
-        var track = transceiver.publishedTrack;
-        if (track) {
-          if (getMediaFamily$1(mediaType) === MediaFamily$1.Audio) {
-            this.sendSourceIndication(mediaType, +!track.muted);
-          } else {
-            var signaler = this.streamSignalerManager.getEgressStreamSignalerOrThrow(transceiver.mid);
-            var state = track.muted ? 'avatar' : 'live';
-            var 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$4.info("Flushing pending JMP task queue");
       this.pendingJmpTasks.forEach(t => t());
@@ -14824,12 +14878,31 @@ class MultistreamConnection extends EventEmitter {
     });
     this.pc.close();
   }
+  maybeSendSourceIndication(mediaType) {
+    var _a;
+    var transceiver = this.getSendTransceiverOrThrow(mediaType);
+    var numLiveSources = ((_a = transceiver.publishedTrack) === null || _a === void 0 ? void 0 : _a.muted) === false ? 1 : 0;
+    if (getMediaFamily$1(mediaType) === MediaFamily$1.Video) {
+      var sources = this.getVideoSources(mediaType);
+      if (sources === null) {
+        return;
+      }
+      var 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) {
     var sources = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+    var videoContentHint = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : undefined;
     var _a;
     var 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();
@@ -14871,23 +14944,9 @@ class MultistreamConnection extends EventEmitter {
     });
   }
   addTrackListeners(mediaType, track) {
-    var onTrackResolutionChange = () => {
-      var sources = this.getVideoSources(mediaType);
-      if (sources != null) {
-        this.sendSourceIndication(mediaType, 1, sources);
-      }
-    };
+    var onTrackResolutionChange = () => this.maybeSendSourceIndication(mediaType);
     track.on(LocalTrack.Events.TrackConstraintsChange, onTrackResolutionChange);
-    var onTrackMute = event => {
-      if (getMediaFamily$1(mediaType) === MediaFamily$1.Audio) {
-        this.sendSourceIndication(mediaType, +!event.trackState.muted);
-      } else {
-        var sources = this.getVideoSources(mediaType);
-        if (sources != null) {
-          this.sendSourceIndication(mediaType, +!event.trackState.muted, sources);
-        }
-      }
-    };
+    var onTrackMute = () => this.maybeSendSourceIndication(mediaType);
     track.on(LocalTrack.Events.Muted, onTrackMute);
     var onTrackPublish = event => {
       if (!event.isPublished) {
@@ -14895,13 +14954,8 @@ class MultistreamConnection extends EventEmitter {
         track.off(LocalTrack.Events.PublishedStateUpdate, onTrackPublish);
         track.off(LocalTrack.Events.TrackConstraintsChange, onTrackResolutionChange);
       }
-      if (getMediaFamily$1(mediaType) === MediaFamily$1.Audio) {
-        this.sendSourceIndication(mediaType, +event.isPublished);
-      } else {
-        var 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);
@@ -15172,7 +15226,7 @@ class MultistreamConnection extends EventEmitter {
   }
   renewPeerConnection(userOptions) {
     if (userOptions) {
-      this.options = Object.assign(Object.assign({}, defaultMultistreamConnectionOptions), userOptions);
+      this.options = Object.assign(Object.assign({}, this.options), userOptions);
     }
     logger$4.info("Renewing multistream connection with options ".concat(JSON.stringify(this.options)));
     this.clearMids();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/internal-media-core",
-  "version": "1.35.5",
+  "version": "1.35.7",
   "files": [
     "dist/cjs",
     "dist/esm",
@@ -45,9 +45,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.9",
-    "@webex/json-multistream": "1.20.2",
+    "@webex/json-multistream": "1.22.0",
     "@webex/ts-sdp": "1.3.2",
-    "@webex/web-client-media-engine": "1.40.2",
+    "@webex/web-client-media-engine": "1.40.6",
     "detectrtc": "^1.4.1",
     "events": "^3.3.0",
     "typed-emitter": "^2.1.0",