@webex/internal-media-core 1.35.1 → 1.35.2

package/dist/cjs/index.js

@@ -14141,7 +14141,8 @@ var defaultMultistreamConnectionOptions = {
   disableSimulcast: getBrowserDetails().name === 'Firefox',
   streamSignalingMode: 'SSRC',
   bundlePolicy: 'max-compat',
-  iceServers: undefined
+  iceServers: undefined,
+  disableContentSimulcast: true
 };
 class MultistreamConnection extends EventEmitter {
   constructor() {
@@ -14163,11 +14164,11 @@ class MultistreamConnection extends EventEmitter {
     this.overuseStateManager.start();
     this.statsManager = new StatsManager(() => this.pc.getStats(), stats => this.preProcessStats(stats));
     var mainSceneId = generateSceneId();
-    var videoMainEncodingOptions = this.getVideoEncodingOptions();
+    var videoMainEncodingOptions = this.getVideoEncodingOptions(MediaContent$1.Main);
     this.createSendTransceiver(MediaType.VideoMain, mainSceneId, videoMainEncodingOptions);
     this.createSendTransceiver(MediaType.AudioMain, mainSceneId);
     if (this.options.floorControlledPresentation) {
-      var videoPresentationEncodingOptions = this.getVideoEncodingOptions();
+      var videoPresentationEncodingOptions = this.getVideoEncodingOptions(MediaContent$1.Slides);
       var contentSceneId = generateSceneId();
       this.createSendTransceiver(MediaType.VideoSlides, contentSceneId, videoPresentationEncodingOptions);
       this.createSendTransceiver(MediaType.AudioSlides, contentSceneId);
@@ -14197,8 +14198,9 @@ class MultistreamConnection extends EventEmitter {
   getConnectionState() {
     return this.pc.getConnectionState();
   }
-  getVideoEncodingOptions() {
-    return !this.options.disableSimulcast ? [{
+  getVideoEncodingOptions(content) {
+    var enabledSimulcast = content === MediaContent$1.Main ? !this.options.disableSimulcast : !this.options.disableContentSimulcast;
+    return enabledSimulcast ? [{
       scaleResolutionDownBy: 4,
       active: false
     }, {
@@ -14630,7 +14632,7 @@ class MultistreamConnection extends EventEmitter {
     });
     parsed.avMedia.filter(av => av.direction === 'sendrecv').forEach(av => {
       var egressSignaler = this.streamSignalerManager.getOrCreateEgressStreamSignaler(av.mid);
-      var simulcastEnabled = av.type === 'video' ? !this.options.disableSimulcast : false;
+      var simulcastEnabled = !!av.simulcast;
       var rtxEnabled = av.type === 'video';
       egressSignaler.signalStreams(simulcastEnabled, rtxEnabled, av);
       if (av.type === 'video') {
@@ -14691,15 +14693,25 @@ class MultistreamConnection extends EventEmitter {
   requestMedia(mediaType, mediaRequests) {
     var _a;
     var task = () => {
+      var _a;
       var jmpSession = this.jmpSessions.get(mediaType);
       if (!jmpSession) {
         logger$4.error("Unable to find jmp session for ".concat(mediaType));
         return;
       }
-      if (!mediaRequests.every(mr => mr.receiveSlots.every(rs => rs.id))) {
-        logger$4.error("Running subscribe task, but ReceiveSlot ID is missing!");
-        return;
-      }
+      var requestedReceiveSlotIds = [];
+      mediaRequests.forEach(mr => mr.receiveSlots.forEach(rs => {
+        if (!rs.id) {
+          logger$4.error("Running subscribe task, but ReceiveSlot ID is missing!");
+          return;
+        }
+        requestedReceiveSlotIds.push(rs.id);
+      }));
+      (_a = this.recvTransceivers.get(mediaType)) === null || _a === void 0 ? void 0 : _a.forEach(transceiver => {
+        if (!requestedReceiveSlotIds.some(id => compareStreamIds(id, transceiver.receiveSlot.id))) {
+          transceiver.receiveSlot._updateSource('no source', undefined);
+        }
+      });
       jmpSession.sendRequests(mediaRequests.map(mr => mr._toJmpScrRequest()));
     };
     if (((_a = this.dataChannel) === null || _a === void 0 ? void 0 : _a.readyState) === 'open') {
@@ -14722,7 +14734,7 @@ class MultistreamConnection extends EventEmitter {
       this.addMid(mediaType);
       transceiver.replaceTransceiver(this.pc.addTransceiver(toMediaStreamTrackKind(mediaType), {
         direction: 'sendrecv',
-        sendEncodings: getMediaFamily$1(mediaType) === MediaFamily.Video ? this.getVideoEncodingOptions() : undefined
+        sendEncodings: getMediaFamily$1(mediaType) === MediaFamily.Video ? this.getVideoEncodingOptions(getMediaContent(mediaType)) : undefined
       }));
       transceiver.csi = generateCsi(getMediaFamily$1(mediaType), mainSceneId);
       (_a = this.jmpSessions.get(mediaType)) === null || _a === void 0 ? void 0 : _a.close();

package/dist/esm/index.js

@@ -14130,7 +14130,8 @@ var defaultMultistreamConnectionOptions = {
   disableSimulcast: getBrowserDetails().name === 'Firefox',
   streamSignalingMode: 'SSRC',
   bundlePolicy: 'max-compat',
-  iceServers: undefined
+  iceServers: undefined,
+  disableContentSimulcast: true
 };
 class MultistreamConnection extends EventEmitter {
   constructor() {
@@ -14152,11 +14153,11 @@ class MultistreamConnection extends EventEmitter {
     this.overuseStateManager.start();
     this.statsManager = new StatsManager(() => this.pc.getStats(), stats => this.preProcessStats(stats));
     var mainSceneId = generateSceneId();
-    var videoMainEncodingOptions = this.getVideoEncodingOptions();
+    var videoMainEncodingOptions = this.getVideoEncodingOptions(MediaContent$1.Main);
     this.createSendTransceiver(MediaType$1.VideoMain, mainSceneId, videoMainEncodingOptions);
     this.createSendTransceiver(MediaType$1.AudioMain, mainSceneId);
     if (this.options.floorControlledPresentation) {
-      var videoPresentationEncodingOptions = this.getVideoEncodingOptions();
+      var videoPresentationEncodingOptions = this.getVideoEncodingOptions(MediaContent$1.Slides);
       var contentSceneId = generateSceneId();
       this.createSendTransceiver(MediaType$1.VideoSlides, contentSceneId, videoPresentationEncodingOptions);
       this.createSendTransceiver(MediaType$1.AudioSlides, contentSceneId);
@@ -14186,8 +14187,9 @@ class MultistreamConnection extends EventEmitter {
   getConnectionState() {
     return this.pc.getConnectionState();
   }
-  getVideoEncodingOptions() {
-    return !this.options.disableSimulcast ? [{
+  getVideoEncodingOptions(content) {
+    var enabledSimulcast = content === MediaContent$1.Main ? !this.options.disableSimulcast : !this.options.disableContentSimulcast;
+    return enabledSimulcast ? [{
       scaleResolutionDownBy: 4,
       active: false
     }, {
@@ -14619,7 +14621,7 @@ class MultistreamConnection extends EventEmitter {
     });
     parsed.avMedia.filter(av => av.direction === 'sendrecv').forEach(av => {
       var egressSignaler = this.streamSignalerManager.getOrCreateEgressStreamSignaler(av.mid);
-      var simulcastEnabled = av.type === 'video' ? !this.options.disableSimulcast : false;
+      var simulcastEnabled = !!av.simulcast;
       var rtxEnabled = av.type === 'video';
       egressSignaler.signalStreams(simulcastEnabled, rtxEnabled, av);
       if (av.type === 'video') {
@@ -14680,15 +14682,25 @@ class MultistreamConnection extends EventEmitter {
   requestMedia(mediaType, mediaRequests) {
     var _a;
     var task = () => {
+      var _a;
       var jmpSession = this.jmpSessions.get(mediaType);
       if (!jmpSession) {
         logger$4.error("Unable to find jmp session for ".concat(mediaType));
         return;
       }
-      if (!mediaRequests.every(mr => mr.receiveSlots.every(rs => rs.id))) {
-        logger$4.error("Running subscribe task, but ReceiveSlot ID is missing!");
-        return;
-      }
+      var requestedReceiveSlotIds = [];
+      mediaRequests.forEach(mr => mr.receiveSlots.forEach(rs => {
+        if (!rs.id) {
+          logger$4.error("Running subscribe task, but ReceiveSlot ID is missing!");
+          return;
+        }
+        requestedReceiveSlotIds.push(rs.id);
+      }));
+      (_a = this.recvTransceivers.get(mediaType)) === null || _a === void 0 ? void 0 : _a.forEach(transceiver => {
+        if (!requestedReceiveSlotIds.some(id => compareStreamIds(id, transceiver.receiveSlot.id))) {
+          transceiver.receiveSlot._updateSource('no source', undefined);
+        }
+      });
       jmpSession.sendRequests(mediaRequests.map(mr => mr._toJmpScrRequest()));
     };
     if (((_a = this.dataChannel) === null || _a === void 0 ? void 0 : _a.readyState) === 'open') {
@@ -14711,7 +14723,7 @@ class MultistreamConnection extends EventEmitter {
       this.addMid(mediaType);
       transceiver.replaceTransceiver(this.pc.addTransceiver(toMediaStreamTrackKind(mediaType), {
         direction: 'sendrecv',
-        sendEncodings: getMediaFamily$1(mediaType) === MediaFamily$1.Video ? this.getVideoEncodingOptions() : undefined
+        sendEncodings: getMediaFamily$1(mediaType) === MediaFamily$1.Video ? this.getVideoEncodingOptions(getMediaContent(mediaType)) : undefined
       }));
       transceiver.csi = generateCsi(getMediaFamily$1(mediaType), mainSceneId);
       (_a = this.jmpSessions.get(mediaType)) === null || _a === void 0 ? void 0 : _a.close();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/internal-media-core",
-  "version": "1.35.1",
+  "version": "1.35.2",
   "files": [
     "dist/cjs",
     "dist/esm",
@@ -47,7 +47,7 @@
     "@babel/runtime": "^7.18.9",
     "@webex/json-multistream": "1.20.2",
     "@webex/ts-sdp": "1.3.0",
-    "@webex/web-client-media-engine": "1.38.1",
+    "@webex/web-client-media-engine": "1.38.4",
     "detectrtc": "^1.4.1",
     "events": "^3.3.0",
     "typed-emitter": "^2.1.0",