@webex/plugin-meetings 3.0.0-beta.37 → 3.0.0-beta.38

package/dist/breakouts/breakout.js

@@ -130,7 +130,7 @@ var Breakout = _webexCore.WebexPlugin.extend({
       sessionId: this.sessionId
     });
   },
-  version: "3.0.0-beta.37"
+  version: "3.0.0-beta.38"
 });
 var _default = Breakout;
 exports.default = _default;

package/dist/breakouts/index.js

@@ -451,7 +451,7 @@ var Breakouts = _webexCore.WebexPlugin.extend({
       }, _callee3);
     }))();
   },
-  version: "3.0.0-beta.37"
+  version: "3.0.0-beta.38"
 });
 var _default = Breakouts;
 exports.default = _default;

package/dist/multistream/mediaRequestManager.js

@@ -6,8 +6,8 @@ _Object$defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MediaRequestManager = void 0;
-var _values = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/values"));
 var _entries = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/entries"));
+var _values = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/values"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/slicedToArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/createClass"));
@@ -32,43 +32,15 @@ var MediaRequestManager = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "sendMediaRequestsCallback", void 0);
     (0, _defineProperty2.default)(this, "counter", void 0);
     (0, _defineProperty2.default)(this, "clientRequests", void 0);
-    (0, _defineProperty2.default)(this, "slotsActiveInLastMediaRequest", void 0);
     (0, _defineProperty2.default)(this, "degradationPreferences", void 0);
     (0, _defineProperty2.default)(this, "sourceUpdateListener", void 0);
     this.sendMediaRequestsCallback = sendMediaRequestsCallback;
     this.counter = 0;
     this.clientRequests = {};
-    this.slotsActiveInLastMediaRequest = {};
     this.degradationPreferences = degradationPreferences;
     this.sourceUpdateListener = this.commit.bind(this);
   }
   (0, _createClass2.default)(MediaRequestManager, [{
-    key: "resetInactiveReceiveSlots",
-    value: function resetInactiveReceiveSlots() {
-      var activeSlots = {};
-
-      // create a map of all currently used slot ids
-      (0, _values.default)(this.clientRequests).forEach(function (request) {
-        return request.receiveSlots.forEach(function (slot) {
-          activeSlots[slot.id] = slot;
-        });
-      });
-
-      // when we stop using some receive slots and they are not included in the new media request,
-      // we will never get a 'no source' notification for them, so we reset their state,
-      // so that the client doesn't try to display their video anymore
-      for (var _i = 0, _Object$entries = (0, _entries.default)(this.slotsActiveInLastMediaRequest); _i < _Object$entries.length; _i++) {
-        var _Object$entries$_i = (0, _slicedToArray2.default)(_Object$entries[_i], 2),
-          slotId = _Object$entries$_i[0],
-          slot = _Object$entries$_i[1];
-        if (!(slotId in activeSlots)) {
-          _loggerProxy.default.logger.info("multistream:mediaRequestManager --> resetting sourceState to \"no source\" for slot ".concat(slot.id));
-          slot.resetSourceState();
-        }
-      }
-      this.slotsActiveInLastMediaRequest = activeSlots;
-    }
-  }, {
     key: "setDegradationPreferences",
     value: function setDegradationPreferences(degradationPreferences) {
       this.degradationPreferences = degradationPreferences;
@@ -126,7 +98,6 @@ var MediaRequestManager = /*#__PURE__*/function () {
         }), maxPayloadBitsPerSecond, mr.codecInfo && [new _internalMediaCore.CodecInfo(0x80, new _internalMediaCore.H264Codec(mr.codecInfo.maxFs, mr.codecInfo.maxFps || CODEC_DEFAULTS.h264.maxFps, mr.codecInfo.maxMbps || CODEC_DEFAULTS.h264.maxMbps, mr.codecInfo.maxWidth, mr.codecInfo.maxHeight))]));
       });
       this.sendMediaRequestsCallback(wcmeMediaRequests);
-      this.resetInactiveReceiveSlots();
     }
   }, {
     key: "addRequest",
@@ -167,7 +138,6 @@ var MediaRequestManager = /*#__PURE__*/function () {
     key: "reset",
     value: function reset() {
       this.clientRequests = {};
-      this.slotsActiveInLastMediaRequest = {};
     }
   }]);
   return MediaRequestManager;

package/dist/multistream/mediaRequestManager.js.map

@@ -1 +1 @@
-{"version":3,"names":["CODEC_DEFAULTS","h264","maxFs","maxFps","maxMbps","MediaRequestManager","degradationPreferences","sendMediaRequestsCallback","counter","clientRequests","slotsActiveInLastMediaRequest","sourceUpdateListener","commit","bind","activeSlots","forEach","request","receiveSlots","slot","id","slotId","LoggerProxy","logger","info","resetSourceState","sendRequests","maxFsLimits","getMaxFs","totalMacroblocksRequested","mr","codecInfo","Math","min","i","slotsWithLiveSource","filter","rs","sourceState","length","maxMacroblocksLimit","warn","wcmeMediaRequests","getDegradedClientRequests","maxPayloadBitsPerSecond","push","WcmeMediaRequest","policyInfo","policy","Policy","ActiveSpeaker","ReceiverSelected","ActiveSpeakerInfo","priority","crossPriorityDuplication","crossPolicyDuplication","preferLiveVideo","ReceiverSelectedInfo","csi","map","receiveSlot","wcmeReceiveSlot","WcmeCodecInfo","H264Codec","maxWidth","maxHeight","resetInactiveReceiveSlots","mediaRequest","newId","on","ReceiveSlotEvents","SourceUpdate","requestId","off"],"sources":["mediaRequestManager.ts"],"sourcesContent":["/* eslint-disable require-jsdoc */\nimport {\n  MediaRequest as WcmeMediaRequest,\n  Policy,\n  ActiveSpeakerInfo,\n  ReceiverSelectedInfo,\n  CodecInfo as WcmeCodecInfo,\n  H264Codec,\n} from '@webex/internal-media-core';\nimport {cloneDeep} from 'lodash';\n\nimport LoggerProxy from '../common/logs/logger-proxy';\n\nimport {ReceiveSlot, ReceiveSlotEvents, ReceiveSlotId} from './receiveSlot';\nimport {getMaxFs} from './remoteMedia';\n\nexport interface ActiveSpeakerPolicyInfo {\n  policy: 'active-speaker';\n  priority: number;\n  crossPriorityDuplication: boolean;\n  crossPolicyDuplication: boolean;\n  preferLiveVideo: boolean;\n}\n\nexport interface ReceiverSelectedPolicyInfo {\n  policy: 'receiver-selected';\n  csi: number;\n}\n\nexport type PolicyInfo = ActiveSpeakerPolicyInfo | ReceiverSelectedPolicyInfo;\n\nexport interface H264CodecInfo {\n  codec: 'h264';\n  maxFs?: number;\n  maxFps?: number;\n  maxMbps?: number;\n  maxWidth?: number;\n  maxHeight?: number;\n}\n\nexport type CodecInfo = H264CodecInfo; // we'll add AV1 here in the future when it's available\n\nexport interface MediaRequest {\n  policyInfo: PolicyInfo;\n  receiveSlots: Array<ReceiveSlot>;\n  codecInfo?: CodecInfo;\n}\n\nexport type MediaRequestId = string;\n\nconst CODEC_DEFAULTS = {\n  h264: {\n    maxFs: 8192,\n    maxFps: 3000,\n    maxMbps: 245760,\n  },\n};\n\ntype DegradationPreferences = {\n  maxMacroblocksLimit: number;\n};\n\ntype SendMediaRequestsCallback = (mediaRequests: WcmeMediaRequest[]) => void;\n\nexport class MediaRequestManager {\n  private sendMediaRequestsCallback: SendMediaRequestsCallback;\n\n  private counter: number;\n\n  private clientRequests: {[key: MediaRequestId]: MediaRequest};\n\n  private slotsActiveInLastMediaRequest: {[key: ReceiveSlotId]: ReceiveSlot};\n\n  private degradationPreferences: DegradationPreferences;\n\n  private sourceUpdateListener: () => void;\n\n  constructor(\n    degradationPreferences: DegradationPreferences,\n    sendMediaRequestsCallback: SendMediaRequestsCallback\n  ) {\n    this.sendMediaRequestsCallback = sendMediaRequestsCallback;\n    this.counter = 0;\n    this.clientRequests = {};\n    this.slotsActiveInLastMediaRequest = {};\n    this.degradationPreferences = degradationPreferences;\n    this.sourceUpdateListener = this.commit.bind(this);\n  }\n\n  private resetInactiveReceiveSlots() {\n    const activeSlots: {[key: ReceiveSlotId]: ReceiveSlot} = {};\n\n    // create a map of all currently used slot ids\n    Object.values(this.clientRequests).forEach((request) =>\n      request.receiveSlots.forEach((slot) => {\n        activeSlots[slot.id] = slot;\n      })\n    );\n\n    // when we stop using some receive slots and they are not included in the new media request,\n    // we will never get a 'no source' notification for them, so we reset their state,\n    // so that the client doesn't try to display their video anymore\n    for (const [slotId, slot] of Object.entries(this.slotsActiveInLastMediaRequest)) {\n      if (!(slotId in activeSlots)) {\n        LoggerProxy.logger.info(\n          `multistream:mediaRequestManager --> resetting sourceState to \"no source\" for slot ${slot.id}`\n        );\n        slot.resetSourceState();\n      }\n    }\n\n    this.slotsActiveInLastMediaRequest = activeSlots;\n  }\n\n  public setDegradationPreferences(degradationPreferences: DegradationPreferences) {\n    this.degradationPreferences = degradationPreferences;\n    this.sendRequests(); // re-send requests after preferences are set\n  }\n\n  private getDegradedClientRequests() {\n    const clientRequests = cloneDeep(this.clientRequests);\n    const maxFsLimits = [\n      getMaxFs('best'),\n      getMaxFs('large'),\n      getMaxFs('medium'),\n      getMaxFs('small'),\n      getMaxFs('very small'),\n      getMaxFs('thumbnail'),\n    ];\n\n    // reduce max-fs until total macroblocks is below limit\n    for (let i = 0; i < maxFsLimits.length; i += 1) {\n      let totalMacroblocksRequested = 0;\n      Object.entries(clientRequests).forEach(([id, mr]) => {\n        if (mr.codecInfo) {\n          mr.codecInfo.maxFs = Math.min(\n            mr.codecInfo.maxFs || CODEC_DEFAULTS.h264.maxFs,\n            maxFsLimits[i]\n          );\n          // we only consider sources with \"live\" state\n          const slotsWithLiveSource = this.clientRequests[id].receiveSlots.filter(\n            (rs) => rs.sourceState === 'live'\n          );\n          totalMacroblocksRequested += mr.codecInfo.maxFs * slotsWithLiveSource.length;\n        }\n      });\n      if (totalMacroblocksRequested <= this.degradationPreferences.maxMacroblocksLimit) {\n        if (i !== 0) {\n          LoggerProxy.logger.warn(\n            `multistream:mediaRequestManager --> too many streams with high max-fs, frame size will be limited to ${maxFsLimits[i]}`\n          );\n        }\n        break;\n      } else if (i === maxFsLimits.length - 1) {\n        LoggerProxy.logger.warn(\n          `multistream:mediaRequestManager --> even with frame size limited to ${maxFsLimits[i]} you are still requesting too many streams, consider reducing the number of requests`\n        );\n      }\n    }\n\n    return clientRequests;\n  }\n\n  private sendRequests() {\n    const wcmeMediaRequests: WcmeMediaRequest[] = [];\n\n    const clientRequests = this.getDegradedClientRequests();\n    const maxPayloadBitsPerSecond = 10 * 1000 * 1000;\n\n    // map all the client media requests to wcme media requests\n    Object.values(clientRequests).forEach((mr) => {\n      wcmeMediaRequests.push(\n        new WcmeMediaRequest(\n          mr.policyInfo.policy === 'active-speaker'\n            ? Policy.ActiveSpeaker\n            : Policy.ReceiverSelected,\n          mr.policyInfo.policy === 'active-speaker'\n            ? new ActiveSpeakerInfo(\n                mr.policyInfo.priority,\n                mr.policyInfo.crossPriorityDuplication,\n                mr.policyInfo.crossPolicyDuplication,\n                mr.policyInfo.preferLiveVideo\n              )\n            : new ReceiverSelectedInfo(mr.policyInfo.csi),\n          mr.receiveSlots.map((receiveSlot) => receiveSlot.wcmeReceiveSlot),\n          maxPayloadBitsPerSecond,\n          mr.codecInfo && [\n            new WcmeCodecInfo(\n              0x80,\n              new H264Codec(\n                mr.codecInfo.maxFs,\n                mr.codecInfo.maxFps || CODEC_DEFAULTS.h264.maxFps,\n                mr.codecInfo.maxMbps || CODEC_DEFAULTS.h264.maxMbps,\n                mr.codecInfo.maxWidth,\n                mr.codecInfo.maxHeight\n              )\n            ),\n          ]\n        )\n      );\n    });\n\n    this.sendMediaRequestsCallback(wcmeMediaRequests);\n\n    this.resetInactiveReceiveSlots();\n  }\n\n  public addRequest(mediaRequest: MediaRequest, commit = true): MediaRequestId {\n    // eslint-disable-next-line no-plusplus\n    const newId = `${this.counter++}`;\n\n    this.clientRequests[newId] = mediaRequest;\n\n    mediaRequest.receiveSlots.forEach((rs) => {\n      rs.on(ReceiveSlotEvents.SourceUpdate, this.sourceUpdateListener);\n    });\n\n    if (commit) {\n      this.commit();\n    }\n\n    return newId;\n  }\n\n  public cancelRequest(requestId: MediaRequestId, commit = true) {\n    this.clientRequests[requestId]?.receiveSlots.forEach((rs) => {\n      rs.off(ReceiveSlotEvents.SourceUpdate, this.sourceUpdateListener);\n    });\n\n    delete this.clientRequests[requestId];\n\n    if (commit) {\n      this.commit();\n    }\n  }\n\n  public commit() {\n    return this.sendRequests();\n  }\n\n  public reset() {\n    this.clientRequests = {};\n    this.slotsActiveInLastMediaRequest = {};\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["CODEC_DEFAULTS","h264","maxFs","maxFps","maxMbps","MediaRequestManager","degradationPreferences","sendMediaRequestsCallback","counter","clientRequests","sourceUpdateListener","commit","bind","sendRequests","maxFsLimits","getMaxFs","totalMacroblocksRequested","forEach","id","mr","codecInfo","Math","min","i","slotsWithLiveSource","receiveSlots","filter","rs","sourceState","length","maxMacroblocksLimit","LoggerProxy","logger","warn","wcmeMediaRequests","getDegradedClientRequests","maxPayloadBitsPerSecond","push","WcmeMediaRequest","policyInfo","policy","Policy","ActiveSpeaker","ReceiverSelected","ActiveSpeakerInfo","priority","crossPriorityDuplication","crossPolicyDuplication","preferLiveVideo","ReceiverSelectedInfo","csi","map","receiveSlot","wcmeReceiveSlot","WcmeCodecInfo","H264Codec","maxWidth","maxHeight","mediaRequest","newId","on","ReceiveSlotEvents","SourceUpdate","requestId","off"],"sources":["mediaRequestManager.ts"],"sourcesContent":["/* eslint-disable require-jsdoc */\nimport {\n  MediaRequest as WcmeMediaRequest,\n  Policy,\n  ActiveSpeakerInfo,\n  ReceiverSelectedInfo,\n  CodecInfo as WcmeCodecInfo,\n  H264Codec,\n} from '@webex/internal-media-core';\nimport {cloneDeep} from 'lodash';\n\nimport LoggerProxy from '../common/logs/logger-proxy';\n\nimport {ReceiveSlot, ReceiveSlotEvents, ReceiveSlotId} from './receiveSlot';\nimport {getMaxFs} from './remoteMedia';\n\nexport interface ActiveSpeakerPolicyInfo {\n  policy: 'active-speaker';\n  priority: number;\n  crossPriorityDuplication: boolean;\n  crossPolicyDuplication: boolean;\n  preferLiveVideo: boolean;\n}\n\nexport interface ReceiverSelectedPolicyInfo {\n  policy: 'receiver-selected';\n  csi: number;\n}\n\nexport type PolicyInfo = ActiveSpeakerPolicyInfo | ReceiverSelectedPolicyInfo;\n\nexport interface H264CodecInfo {\n  codec: 'h264';\n  maxFs?: number;\n  maxFps?: number;\n  maxMbps?: number;\n  maxWidth?: number;\n  maxHeight?: number;\n}\n\nexport type CodecInfo = H264CodecInfo; // we'll add AV1 here in the future when it's available\n\nexport interface MediaRequest {\n  policyInfo: PolicyInfo;\n  receiveSlots: Array<ReceiveSlot>;\n  codecInfo?: CodecInfo;\n}\n\nexport type MediaRequestId = string;\n\nconst CODEC_DEFAULTS = {\n  h264: {\n    maxFs: 8192,\n    maxFps: 3000,\n    maxMbps: 245760,\n  },\n};\n\ntype DegradationPreferences = {\n  maxMacroblocksLimit: number;\n};\n\ntype SendMediaRequestsCallback = (mediaRequests: WcmeMediaRequest[]) => void;\n\nexport class MediaRequestManager {\n  private sendMediaRequestsCallback: SendMediaRequestsCallback;\n\n  private counter: number;\n\n  private clientRequests: {[key: MediaRequestId]: MediaRequest};\n\n  private degradationPreferences: DegradationPreferences;\n\n  private sourceUpdateListener: () => void;\n\n  constructor(\n    degradationPreferences: DegradationPreferences,\n    sendMediaRequestsCallback: SendMediaRequestsCallback\n  ) {\n    this.sendMediaRequestsCallback = sendMediaRequestsCallback;\n    this.counter = 0;\n    this.clientRequests = {};\n    this.degradationPreferences = degradationPreferences;\n    this.sourceUpdateListener = this.commit.bind(this);\n  }\n\n  public setDegradationPreferences(degradationPreferences: DegradationPreferences) {\n    this.degradationPreferences = degradationPreferences;\n    this.sendRequests(); // re-send requests after preferences are set\n  }\n\n  private getDegradedClientRequests() {\n    const clientRequests = cloneDeep(this.clientRequests);\n    const maxFsLimits = [\n      getMaxFs('best'),\n      getMaxFs('large'),\n      getMaxFs('medium'),\n      getMaxFs('small'),\n      getMaxFs('very small'),\n      getMaxFs('thumbnail'),\n    ];\n\n    // reduce max-fs until total macroblocks is below limit\n    for (let i = 0; i < maxFsLimits.length; i += 1) {\n      let totalMacroblocksRequested = 0;\n      Object.entries(clientRequests).forEach(([id, mr]) => {\n        if (mr.codecInfo) {\n          mr.codecInfo.maxFs = Math.min(\n            mr.codecInfo.maxFs || CODEC_DEFAULTS.h264.maxFs,\n            maxFsLimits[i]\n          );\n          // we only consider sources with \"live\" state\n          const slotsWithLiveSource = this.clientRequests[id].receiveSlots.filter(\n            (rs) => rs.sourceState === 'live'\n          );\n          totalMacroblocksRequested += mr.codecInfo.maxFs * slotsWithLiveSource.length;\n        }\n      });\n      if (totalMacroblocksRequested <= this.degradationPreferences.maxMacroblocksLimit) {\n        if (i !== 0) {\n          LoggerProxy.logger.warn(\n            `multistream:mediaRequestManager --> too many streams with high max-fs, frame size will be limited to ${maxFsLimits[i]}`\n          );\n        }\n        break;\n      } else if (i === maxFsLimits.length - 1) {\n        LoggerProxy.logger.warn(\n          `multistream:mediaRequestManager --> even with frame size limited to ${maxFsLimits[i]} you are still requesting too many streams, consider reducing the number of requests`\n        );\n      }\n    }\n\n    return clientRequests;\n  }\n\n  private sendRequests() {\n    const wcmeMediaRequests: WcmeMediaRequest[] = [];\n\n    const clientRequests = this.getDegradedClientRequests();\n    const maxPayloadBitsPerSecond = 10 * 1000 * 1000;\n\n    // map all the client media requests to wcme media requests\n    Object.values(clientRequests).forEach((mr) => {\n      wcmeMediaRequests.push(\n        new WcmeMediaRequest(\n          mr.policyInfo.policy === 'active-speaker'\n            ? Policy.ActiveSpeaker\n            : Policy.ReceiverSelected,\n          mr.policyInfo.policy === 'active-speaker'\n            ? new ActiveSpeakerInfo(\n                mr.policyInfo.priority,\n                mr.policyInfo.crossPriorityDuplication,\n                mr.policyInfo.crossPolicyDuplication,\n                mr.policyInfo.preferLiveVideo\n              )\n            : new ReceiverSelectedInfo(mr.policyInfo.csi),\n          mr.receiveSlots.map((receiveSlot) => receiveSlot.wcmeReceiveSlot),\n          maxPayloadBitsPerSecond,\n          mr.codecInfo && [\n            new WcmeCodecInfo(\n              0x80,\n              new H264Codec(\n                mr.codecInfo.maxFs,\n                mr.codecInfo.maxFps || CODEC_DEFAULTS.h264.maxFps,\n                mr.codecInfo.maxMbps || CODEC_DEFAULTS.h264.maxMbps,\n                mr.codecInfo.maxWidth,\n                mr.codecInfo.maxHeight\n              )\n            ),\n          ]\n        )\n      );\n    });\n\n    this.sendMediaRequestsCallback(wcmeMediaRequests);\n  }\n\n  public addRequest(mediaRequest: MediaRequest, commit = true): MediaRequestId {\n    // eslint-disable-next-line no-plusplus\n    const newId = `${this.counter++}`;\n\n    this.clientRequests[newId] = mediaRequest;\n\n    mediaRequest.receiveSlots.forEach((rs) => {\n      rs.on(ReceiveSlotEvents.SourceUpdate, this.sourceUpdateListener);\n    });\n\n    if (commit) {\n      this.commit();\n    }\n\n    return newId;\n  }\n\n  public cancelRequest(requestId: MediaRequestId, commit = true) {\n    this.clientRequests[requestId]?.receiveSlots.forEach((rs) => {\n      rs.off(ReceiveSlotEvents.SourceUpdate, this.sourceUpdateListener);\n    });\n\n    delete this.clientRequests[requestId];\n\n    if (commit) {\n      this.commit();\n    }\n  }\n\n  public commit() {\n    return this.sendRequests();\n  }\n\n  public reset() {\n    this.clientRequests = {};\n  }\n}\n"],"mappings":"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"}

package/dist/multistream/receiveSlot.js

@@ -167,21 +167,6 @@ var ReceiveSlot = /*#__PURE__*/function (_EventsScope) {
     get: function get() {
       return this.mcReceiveSlot;
     }
-
-    /**
-     * Resets the source state to the default 'no source' value.
-     * This function should be called on receive slots that are
-     * no longer part of a media request. It's needed because WCME
-     * does not send any more events on such slots, so the sourceState
-     * value would not represent the truth anymore.
-     */
-  }, {
-    key: "resetSourceState",
-    value: function resetSourceState() {
-      (0, _classPrivateFieldSet2.default)(this, _sourceState, 'no source');
-      (0, _classPrivateFieldSet2.default)(this, _csi, undefined);
-      (0, _classPrivateFieldSet2.default)(this, _memberId, undefined);
-    }
   }]);
   return ReceiveSlot;
 }(_eventsScope.default);

package/dist/multistream/receiveSlot.js.map

@@ -1 +1 @@
-{"version":3,"names":["ReceiveSlotEvents","SourceUpdate","receiveSlotCounter","ReceiveSlot","mediaType","mcReceiveSlot","findMemberIdCallback","id","setupEventListeners","scope","file","function","on","WcmeReceiveSlotEvents","state","csi","LoggerProxy","logger","log","undefined","emit","memberId","stream","EventsScope"],"sources":["receiveSlot.ts"],"sourcesContent":["/* eslint-disable valid-jsdoc */\nimport {\n  MediaType,\n  ReceiveSlot as WcmeReceiveSlot,\n  ReceiveSlotEvents as WcmeReceiveSlotEvents,\n  SourceState,\n} from '@webex/internal-media-core';\n\nimport LoggerProxy from '../common/logs/logger-proxy';\nimport EventsScope from '../common/events/events-scope';\n\nexport const ReceiveSlotEvents = {\n  SourceUpdate: 'sourceUpdate',\n};\n\nexport type {SourceState} from '@webex/internal-media-core';\nexport type CSI = number;\nexport type MemberId = string;\nexport type ReceiveSlotId = string;\n\nlet receiveSlotCounter = 0;\n\nexport type FindMemberIdCallback = (csi: CSI) => MemberId | undefined;\n\n/**\n * Class representing a receive slot. A single receive slot is able to receive a single track\n * for example some participant's main video or audio\n */\nexport class ReceiveSlot extends EventsScope {\n  private readonly mcReceiveSlot: WcmeReceiveSlot;\n\n  private readonly findMemberIdCallback: FindMemberIdCallback;\n\n  public readonly id: ReceiveSlotId;\n\n  public readonly mediaType: MediaType;\n\n  #memberId?: MemberId;\n\n  #csi?: CSI;\n\n  #sourceState: SourceState;\n\n  /**\n   * constructor - don't use it directly, you should always use meeting.receiveSlotManager.allocateSlot()\n   * to create any receive slots\n   *\n   * @param {MediaType} mediaType\n   * @param {ReceiveSlot} mcReceiveSlot\n   * @param {FindMemberIdCallback} findMemberIdCallback callback for finding memberId for given CSI\n   */\n  constructor(\n    mediaType: MediaType,\n    mcReceiveSlot: WcmeReceiveSlot,\n    findMemberIdCallback: FindMemberIdCallback\n  ) {\n    super();\n\n    receiveSlotCounter += 1;\n\n    this.findMemberIdCallback = findMemberIdCallback;\n    this.mediaType = mediaType;\n    this.mcReceiveSlot = mcReceiveSlot;\n    this.#sourceState = 'no source';\n    this.id = `r${receiveSlotCounter}`;\n\n    this.setupEventListeners();\n  }\n\n  /**\n   * Getter for memberId\n   */\n  public get memberId() {\n    return this.#memberId;\n  }\n\n  /**\n   * Getter for csi\n   */\n  public get csi() {\n    return this.#csi;\n  }\n\n  /**\n   * Getter for sourceState\n   */\n  public get sourceState() {\n    return this.#sourceState;\n  }\n\n  /**\n   * registers event handlers with the underlying ReceiveSlot\n   */\n  private setupEventListeners() {\n    const scope = {\n      file: 'meeting/receiveSlot',\n      function: 'setupEventListeners',\n    };\n\n    this.mcReceiveSlot.on(\n      WcmeReceiveSlotEvents.SourceUpdate,\n      (state: SourceState, csi?: number) => {\n        LoggerProxy.logger.log(\n          `ReceiveSlot#setupEventListeners --> got source update on receive slot ${this.id}, mediaType=${this.mediaType}, csi=${csi}, state=${state}`\n        );\n        this.#memberId = csi ? this.findMemberIdCallback(csi) : undefined;\n        this.#csi = csi;\n        this.#sourceState = state;\n\n        this.emit(scope, ReceiveSlotEvents.SourceUpdate, {\n          state: this.#sourceState,\n          csi: this.#csi,\n          memberId: this.#memberId,\n        });\n      }\n    );\n  }\n\n  /** Tries to find the member id for this receive slot if it hasn't got one */\n  public findMemberId() {\n    if (this.#memberId === undefined && this.#csi) {\n      this.#memberId = this.findMemberIdCallback(this.#csi);\n\n      if (this.#memberId) {\n        // if we found the memberId, simulate source update so that the client app knows that something's changed\n        this.emit(\n          {\n            file: 'meeting/receiveSlot',\n            function: 'findMemberId',\n          },\n          ReceiveSlotEvents.SourceUpdate,\n          {\n            state: this.#sourceState,\n            csi: this.#csi,\n            memberId: this.#memberId,\n          }\n        );\n      }\n    }\n  }\n\n  /**\n   * The MediaStream object associated with this slot.\n   *\n   * @returns {MediaStream} The MediaStreamTrack.\n   */\n  get stream(): MediaStream {\n    return this.mcReceiveSlot.stream;\n  }\n\n  /**\n   * The underlying WCME receive slot\n   */\n  get wcmeReceiveSlot(): WcmeReceiveSlot {\n    return this.mcReceiveSlot;\n  }\n\n  /**\n   * Resets the source state to the default 'no source' value.\n   * This function should be called on receive slots that are\n   * no longer part of a media request. It's needed because WCME\n   * does not send any more events on such slots, so the sourceState\n   * value would not represent the truth anymore.\n   */\n  public resetSourceState() {\n    this.#sourceState = 'no source';\n    this.#csi = undefined;\n    this.#memberId = undefined;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["ReceiveSlotEvents","SourceUpdate","receiveSlotCounter","ReceiveSlot","mediaType","mcReceiveSlot","findMemberIdCallback","id","setupEventListeners","scope","file","function","on","WcmeReceiveSlotEvents","state","csi","LoggerProxy","logger","log","undefined","emit","memberId","stream","EventsScope"],"sources":["receiveSlot.ts"],"sourcesContent":["/* eslint-disable valid-jsdoc */\nimport {\n  MediaType,\n  ReceiveSlot as WcmeReceiveSlot,\n  ReceiveSlotEvents as WcmeReceiveSlotEvents,\n  SourceState,\n} from '@webex/internal-media-core';\n\nimport LoggerProxy from '../common/logs/logger-proxy';\nimport EventsScope from '../common/events/events-scope';\n\nexport const ReceiveSlotEvents = {\n  SourceUpdate: 'sourceUpdate',\n};\n\nexport type {SourceState} from '@webex/internal-media-core';\nexport type CSI = number;\nexport type MemberId = string;\nexport type ReceiveSlotId = string;\n\nlet receiveSlotCounter = 0;\n\nexport type FindMemberIdCallback = (csi: CSI) => MemberId | undefined;\n\n/**\n * Class representing a receive slot. A single receive slot is able to receive a single track\n * for example some participant's main video or audio\n */\nexport class ReceiveSlot extends EventsScope {\n  private readonly mcReceiveSlot: WcmeReceiveSlot;\n\n  private readonly findMemberIdCallback: FindMemberIdCallback;\n\n  public readonly id: ReceiveSlotId;\n\n  public readonly mediaType: MediaType;\n\n  #memberId?: MemberId;\n\n  #csi?: CSI;\n\n  #sourceState: SourceState;\n\n  /**\n   * constructor - don't use it directly, you should always use meeting.receiveSlotManager.allocateSlot()\n   * to create any receive slots\n   *\n   * @param {MediaType} mediaType\n   * @param {ReceiveSlot} mcReceiveSlot\n   * @param {FindMemberIdCallback} findMemberIdCallback callback for finding memberId for given CSI\n   */\n  constructor(\n    mediaType: MediaType,\n    mcReceiveSlot: WcmeReceiveSlot,\n    findMemberIdCallback: FindMemberIdCallback\n  ) {\n    super();\n\n    receiveSlotCounter += 1;\n\n    this.findMemberIdCallback = findMemberIdCallback;\n    this.mediaType = mediaType;\n    this.mcReceiveSlot = mcReceiveSlot;\n    this.#sourceState = 'no source';\n    this.id = `r${receiveSlotCounter}`;\n\n    this.setupEventListeners();\n  }\n\n  /**\n   * Getter for memberId\n   */\n  public get memberId() {\n    return this.#memberId;\n  }\n\n  /**\n   * Getter for csi\n   */\n  public get csi() {\n    return this.#csi;\n  }\n\n  /**\n   * Getter for sourceState\n   */\n  public get sourceState() {\n    return this.#sourceState;\n  }\n\n  /**\n   * registers event handlers with the underlying ReceiveSlot\n   */\n  private setupEventListeners() {\n    const scope = {\n      file: 'meeting/receiveSlot',\n      function: 'setupEventListeners',\n    };\n\n    this.mcReceiveSlot.on(\n      WcmeReceiveSlotEvents.SourceUpdate,\n      (state: SourceState, csi?: number) => {\n        LoggerProxy.logger.log(\n          `ReceiveSlot#setupEventListeners --> got source update on receive slot ${this.id}, mediaType=${this.mediaType}, csi=${csi}, state=${state}`\n        );\n        this.#memberId = csi ? this.findMemberIdCallback(csi) : undefined;\n        this.#csi = csi;\n        this.#sourceState = state;\n\n        this.emit(scope, ReceiveSlotEvents.SourceUpdate, {\n          state: this.#sourceState,\n          csi: this.#csi,\n          memberId: this.#memberId,\n        });\n      }\n    );\n  }\n\n  /** Tries to find the member id for this receive slot if it hasn't got one */\n  public findMemberId() {\n    if (this.#memberId === undefined && this.#csi) {\n      this.#memberId = this.findMemberIdCallback(this.#csi);\n\n      if (this.#memberId) {\n        // if we found the memberId, simulate source update so that the client app knows that something's changed\n        this.emit(\n          {\n            file: 'meeting/receiveSlot',\n            function: 'findMemberId',\n          },\n          ReceiveSlotEvents.SourceUpdate,\n          {\n            state: this.#sourceState,\n            csi: this.#csi,\n            memberId: this.#memberId,\n          }\n        );\n      }\n    }\n  }\n\n  /**\n   * The MediaStream object associated with this slot.\n   *\n   * @returns {MediaStream} The MediaStreamTrack.\n   */\n  get stream(): MediaStream {\n    return this.mcReceiveSlot.stream;\n  }\n\n  /**\n   * The underlying WCME receive slot\n   */\n  get wcmeReceiveSlot(): WcmeReceiveSlot {\n    return this.mcReceiveSlot;\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AACA;AAOA;AACA;AAAwD;AAAA;AAAA;AAAA;AAEjD,IAAMA,iBAAiB,GAAG;EAC/BC,YAAY,EAAE;AAChB,CAAC;AAAC;AAOF,IAAIC,kBAAkB,GAAG,CAAC;AAAC;AAAA;AAAA;AAI3B;AACA;AACA;AACA;AAHA,IAIaC,WAAW;EAAA;EAAA;EAetB;AACF;AACA;AACA;AACA;AACA;AACA;AACA;EACE,qBACEC,SAAoB,EACpBC,aAA8B,EAC9BC,oBAA0C,EAC1C;IAAA;IAAA;IACA;IAAQ;IAAA;IAAA;IAAA;IAAA;MAAA;MAAA;IAAA;IAAA;MAAA;MAAA;IAAA;IAAA;MAAA;MAAA;IAAA;IAERJ,kBAAkB,IAAI,CAAC;IAEvB,MAAKI,oBAAoB,GAAGA,oBAAoB;IAChD,MAAKF,SAAS,GAAGA,SAAS;IAC1B,MAAKC,aAAa,GAAGA,aAAa;IAClC,+FAAoB,WAAW;IAC/B,MAAKE,EAAE,cAAOL,kBAAkB,CAAE;IAElC,MAAKM,mBAAmB,EAAE;IAAC;EAC7B;;EAEA;AACF;AACA;EAFE;IAAA;IAAA,KAGA,eAAsB;MACpB,2CAAO,IAAI;IACb;;IAEA;AACF;AACA;EAFE;IAAA;IAAA,KAGA,eAAiB;MACf,2CAAO,IAAI;IACb;;IAEA;AACF;AACA;EAFE;IAAA;IAAA,KAGA,eAAyB;MACvB,2CAAO,IAAI;IACb;;IAEA;AACF;AACA;EAFE;IAAA;IAAA,OAGA,+BAA8B;MAAA;MAC5B,IAAMC,KAAK,GAAG;QACZC,IAAI,EAAE,qBAAqB;QAC3BC,QAAQ,EAAE;MACZ,CAAC;MAED,IAAI,CAACN,aAAa,CAACO,EAAE,CACnBC,oCAAqB,CAACZ,YAAY,EAClC,UAACa,KAAkB,EAAEC,GAAY,EAAK;QACpCC,oBAAW,CAACC,MAAM,CAACC,GAAG,iFACqD,MAAI,CAACX,EAAE,yBAAe,MAAI,CAACH,SAAS,mBAASW,GAAG,qBAAWD,KAAK,EAC1I;QACD,0CAAI,aAAaC,GAAG,GAAG,MAAI,CAACT,oBAAoB,CAACS,GAAG,CAAC,GAAGI,SAAS;QACjE,0CAAI,QAAQJ,GAAG;QACf,0CAAI,gBAAgBD,KAAK;QAEzB,MAAI,CAACM,IAAI,CAACX,KAAK,EAAET,iBAAiB,CAACC,YAAY,EAAE;UAC/Ca,KAAK,sCAAE,MAAI,eAAa;UACxBC,GAAG,sCAAE,MAAI,OAAK;UACdM,QAAQ,sCAAE,MAAI;QAChB,CAAC,CAAC;MACJ,CAAC,CACF;IACH;;IAEA;EAAA;IAAA;IAAA,OACA,wBAAsB;MACpB,IAAI,wCAAI,iBAAeF,SAAS,wCAAI,IAAI,OAAK,EAAE;QAC7C,wCAAI,aAAa,IAAI,CAACb,oBAAoB,qCAAC,IAAI,QAAM;QAErD,wCAAI,IAAI,cAAY;UAClB;UACA,IAAI,CAACc,IAAI,CACP;YACEV,IAAI,EAAE,qBAAqB;YAC3BC,QAAQ,EAAE;UACZ,CAAC,EACDX,iBAAiB,CAACC,YAAY,EAC9B;YACEa,KAAK,sCAAE,IAAI,eAAa;YACxBC,GAAG,sCAAE,IAAI,OAAK;YACdM,QAAQ,sCAAE,IAAI;UAChB,CAAC,CACF;QACH;MACF;IACF;;IAEA;AACF;AACA;AACA;AACA;EAJE;IAAA;IAAA,KAKA,eAA0B;MACxB,OAAO,IAAI,CAAChB,aAAa,CAACiB,MAAM;IAClC;;IAEA;AACF;AACA;EAFE;IAAA;IAAA,KAGA,eAAuC;MACrC,OAAO,IAAI,CAACjB,aAAa;IAC3B;EAAC;EAAA;AAAA,EA/H8BkB,oBAAW;AAAA"}

package/dist/types/multistream/mediaRequestManager.d.ts

@@ -35,11 +35,9 @@ export declare class MediaRequestManager {
     private sendMediaRequestsCallback;
     private counter;
     private clientRequests;
-    private slotsActiveInLastMediaRequest;
     private degradationPreferences;
     private sourceUpdateListener;
     constructor(degradationPreferences: DegradationPreferences, sendMediaRequestsCallback: SendMediaRequestsCallback);
-    private resetInactiveReceiveSlots;
     setDegradationPreferences(degradationPreferences: DegradationPreferences): void;
     private getDegradedClientRequests;
     private sendRequests;

package/dist/types/multistream/receiveSlot.d.ts

@@ -55,12 +55,4 @@ export declare class ReceiveSlot extends EventsScope {
      * The underlying WCME receive slot
      */
     get wcmeReceiveSlot(): WcmeReceiveSlot;
-    /**
-     * Resets the source state to the default 'no source' value.
-     * This function should be called on receive slots that are
-     * no longer part of a media request. It's needed because WCME
-     * does not send any more events on such slots, so the sourceState
-     * value would not represent the truth anymore.
-     */
-    resetSourceState(): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/plugin-meetings",
-  "version": "3.0.0-beta.37",
+  "version": "3.0.0-beta.38",
   "description": "",
   "license": "Cisco EULA (https://www.cisco.com/c/en/us/products/end-user-license-agreement.html)",
   "contributors": [
@@ -32,12 +32,12 @@
     "build": "yarn run -T tsc --declaration true --declarationDir ./dist/types"
   },
   "devDependencies": {
-    "@webex/plugin-meetings": "3.0.0-beta.37",
-    "@webex/test-helper-chai": "3.0.0-beta.37",
-    "@webex/test-helper-mocha": "3.0.0-beta.37",
-    "@webex/test-helper-mock-webex": "3.0.0-beta.37",
-    "@webex/test-helper-retry": "3.0.0-beta.37",
-    "@webex/test-helper-test-users": "3.0.0-beta.37",
+    "@webex/plugin-meetings": "3.0.0-beta.38",
+    "@webex/test-helper-chai": "3.0.0-beta.38",
+    "@webex/test-helper-mocha": "3.0.0-beta.38",
+    "@webex/test-helper-mock-webex": "3.0.0-beta.38",
+    "@webex/test-helper-retry": "3.0.0-beta.38",
+    "@webex/test-helper-test-users": "3.0.0-beta.38",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "jsdom-global": "3.0.2",
@@ -46,18 +46,18 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@webex/common": "3.0.0-beta.37",
-    "@webex/internal-media-core": "1.35.1",
-    "@webex/internal-plugin-conversation": "3.0.0-beta.37",
-    "@webex/internal-plugin-device": "3.0.0-beta.37",
-    "@webex/internal-plugin-llm": "3.0.0-beta.37",
-    "@webex/internal-plugin-mercury": "3.0.0-beta.37",
-    "@webex/internal-plugin-metrics": "3.0.0-beta.37",
-    "@webex/internal-plugin-support": "3.0.0-beta.37",
-    "@webex/internal-plugin-user": "3.0.0-beta.37",
-    "@webex/plugin-people": "3.0.0-beta.37",
-    "@webex/plugin-rooms": "3.0.0-beta.37",
-    "@webex/webex-core": "3.0.0-beta.37",
+    "@webex/common": "3.0.0-beta.38",
+    "@webex/internal-media-core": "1.35.2",
+    "@webex/internal-plugin-conversation": "3.0.0-beta.38",
+    "@webex/internal-plugin-device": "3.0.0-beta.38",
+    "@webex/internal-plugin-llm": "3.0.0-beta.38",
+    "@webex/internal-plugin-mercury": "3.0.0-beta.38",
+    "@webex/internal-plugin-metrics": "3.0.0-beta.38",
+    "@webex/internal-plugin-support": "3.0.0-beta.38",
+    "@webex/internal-plugin-user": "3.0.0-beta.38",
+    "@webex/plugin-people": "3.0.0-beta.38",
+    "@webex/plugin-rooms": "3.0.0-beta.38",
+    "@webex/webex-core": "3.0.0-beta.38",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",

package/src/multistream/mediaRequestManager.ts

@@ -69,8 +69,6 @@ export class MediaRequestManager {
 
   private clientRequests: {[key: MediaRequestId]: MediaRequest};
 
-  private slotsActiveInLastMediaRequest: {[key: ReceiveSlotId]: ReceiveSlot};
-
   private degradationPreferences: DegradationPreferences;
 
   private sourceUpdateListener: () => void;
@@ -82,36 +80,10 @@ export class MediaRequestManager {
     this.sendMediaRequestsCallback = sendMediaRequestsCallback;
     this.counter = 0;
     this.clientRequests = {};
-    this.slotsActiveInLastMediaRequest = {};
     this.degradationPreferences = degradationPreferences;
     this.sourceUpdateListener = this.commit.bind(this);
   }
 
-  private resetInactiveReceiveSlots() {
-    const activeSlots: {[key: ReceiveSlotId]: ReceiveSlot} = {};
-
-    // create a map of all currently used slot ids
-    Object.values(this.clientRequests).forEach((request) =>
-      request.receiveSlots.forEach((slot) => {
-        activeSlots[slot.id] = slot;
-      })
-    );
-
-    // when we stop using some receive slots and they are not included in the new media request,
-    // we will never get a 'no source' notification for them, so we reset their state,
-    // so that the client doesn't try to display their video anymore
-    for (const [slotId, slot] of Object.entries(this.slotsActiveInLastMediaRequest)) {
-      if (!(slotId in activeSlots)) {
-        LoggerProxy.logger.info(
-          `multistream:mediaRequestManager --> resetting sourceState to "no source" for slot ${slot.id}`
-        );
-        slot.resetSourceState();
-      }
-    }
-
-    this.slotsActiveInLastMediaRequest = activeSlots;
-  }
-
   public setDegradationPreferences(degradationPreferences: DegradationPreferences) {
     this.degradationPreferences = degradationPreferences;
     this.sendRequests(); // re-send requests after preferences are set
@@ -201,8 +173,6 @@ export class MediaRequestManager {
     });
 
     this.sendMediaRequestsCallback(wcmeMediaRequests);
-
-    this.resetInactiveReceiveSlots();
   }
 
   public addRequest(mediaRequest: MediaRequest, commit = true): MediaRequestId {
@@ -240,6 +210,5 @@ export class MediaRequestManager {
 
   public reset() {
     this.clientRequests = {};
-    this.slotsActiveInLastMediaRequest = {};
   }
 }

package/src/multistream/receiveSlot.ts

@@ -154,17 +154,4 @@ export class ReceiveSlot extends EventsScope {
   get wcmeReceiveSlot(): WcmeReceiveSlot {
     return this.mcReceiveSlot;
   }
-
-  /**
-   * Resets the source state to the default 'no source' value.
-   * This function should be called on receive slots that are
-   * no longer part of a media request. It's needed because WCME
-   * does not send any more events on such slots, so the sourceState
-   * value would not represent the truth anymore.
-   */
-  public resetSourceState() {
-    this.#sourceState = 'no source';
-    this.#csi = undefined;
-    this.#memberId = undefined;
-  }
 }

package/test/unit/spec/multistream/mediaRequestManager.ts

@@ -62,7 +62,6 @@ describe('MediaRequestManager', () => {
             off: sinon.stub(),
             sourceState: 'live',
             wcmeReceiveSlot: fakeWcmeSlots[index],
-            resetSourceState: sinon.stub(),
           } as unknown as ReceiveSlot)
       );
   });
@@ -609,78 +608,6 @@ describe('MediaRequestManager', () => {
     checkMediaRequestsSent([]);
   });
 
-  it('calls resetSourceState() on slots that are stopped being used', () => {
-    const requestIds = [
-      addActiveSpeakerRequest(
-        255,
-        [fakeReceiveSlots[0], fakeReceiveSlots[1]],
-        ACTIVE_SPEAKER_MAX_FS
-      ),
-      addActiveSpeakerRequest(
-        255,
-        [fakeReceiveSlots[2], fakeReceiveSlots[3]],
-        ACTIVE_SPEAKER_MAX_FS
-      ),
-      addReceiverSelectedRequest(100, fakeReceiveSlots[4], RECEIVER_SELECTED_MAX_FS),
-      addReceiverSelectedRequest(200, fakeReceiveSlots[5], RECEIVER_SELECTED_MAX_FS),
-    ];
-
-    mediaRequestManager.commit();
-    checkMediaRequestsSent([
-      {
-        policy: 'active-speaker',
-        priority: 255,
-        receiveSlots: [fakeWcmeSlots[0], fakeWcmeSlots[1]],
-        maxFs: ACTIVE_SPEAKER_MAX_FS,
-      },
-      {
-        policy: 'active-speaker',
-        priority: 255,
-        receiveSlots: [fakeWcmeSlots[2], fakeWcmeSlots[3]],
-        maxFs: ACTIVE_SPEAKER_MAX_FS,
-      },
-      {
-        policy: 'receiver-selected',
-        csi: 100,
-        receiveSlot: fakeWcmeSlots[4],
-        maxFs: RECEIVER_SELECTED_MAX_FS,
-      },
-      {
-        policy: 'receiver-selected',
-        csi: 200,
-        receiveSlot: fakeWcmeSlots[5],
-        maxFs: RECEIVER_SELECTED_MAX_FS,
-      },
-    ]);
-
-    // cancel 2 of the requests
-    mediaRequestManager.cancelRequest(requestIds[1], false);
-    mediaRequestManager.cancelRequest(requestIds[3], false);
-
-    mediaRequestManager.commit();
-
-    // expect only the 2 remaining requests to be sent out
-    checkMediaRequestsSent([
-      {
-        policy: 'active-speaker',
-        priority: 255,
-        receiveSlots: [fakeWcmeSlots[0], fakeWcmeSlots[1]],
-        maxFs: ACTIVE_SPEAKER_MAX_FS,
-      },
-      {
-        policy: 'receiver-selected',
-        csi: 100,
-        receiveSlot: fakeWcmeSlots[4],
-        maxFs: RECEIVER_SELECTED_MAX_FS,
-      },
-    ]);
-
-    // and that the receive slots of the 2 cancelled ones had resetSourceState() called
-    assert.calledOnce(fakeReceiveSlots[2].resetSourceState);
-    assert.calledOnce(fakeReceiveSlots[3].resetSourceState);
-    assert.calledOnce(fakeReceiveSlots[5].resetSourceState);
-  });
-
   it('re-sends media requests after degradation preferences are set', () => {
     // set max macroblocks limit
     mediaRequestManager.setDegradationPreferences({maxMacroblocksLimit: 32400});

package/test/unit/spec/multistream/receiveSlot.ts

@@ -83,25 +83,6 @@ describe('ReceiveSlot', () => {
     assert.strictEqual(receiveSlot.sourceState, 'live');
   });
 
-  it('resets source related properties when resetSourceState() is called', () => {
-    const csi = 123456;
-    const fakeMemberId = '00000001-5555-6666-9012-345678901234';
-
-    findMemberIdCallbackStub.returns(fakeMemberId);
-
-    fakeWcmeSlot.emit(WcmeReceiveSlotEvents.SourceUpdate, 'live', csi);
-
-    assert.strictEqual(receiveSlot.memberId, fakeMemberId);
-    assert.strictEqual(receiveSlot.csi, csi);
-    assert.strictEqual(receiveSlot.sourceState, 'live');
-
-    receiveSlot.resetSourceState();
-
-    assert.strictEqual(receiveSlot.memberId, undefined);
-    assert.strictEqual(receiveSlot.csi, undefined);
-    assert.strictEqual(receiveSlot.sourceState, 'no source');
-  });
-
   describe('findMemberId()', () => {
     it('doesn\'t do anything if csi is not set', () => {
       // by default the receiveSlot does not have any csi or member id