@webex/plugin-meetings 3.0.0-beta.140 → 3.0.0-beta.141

package/dist/breakouts/breakout.js

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

package/dist/breakouts/index.js

@@ -1005,7 +1005,7 @@ var Breakouts = _webexCore.WebexPlugin.extend({
       this.trigger(_constants.BREAKOUTS.EVENTS.ASK_RETURN_TO_MAIN);
     }
   },
-  version: "3.0.0-beta.140"
+  version: "3.0.0-beta.141"
 });
 var _default = Breakouts;
 exports.default = _default;

package/dist/multistream/mediaRequestManager.js

@@ -206,13 +206,15 @@ var MediaRequestManager = /*#__PURE__*/function () {
       // eslint-disable-next-line no-plusplus
       var newId = "".concat(this.counter++);
       this.clientRequests[newId] = mediaRequest;
+      var eventHandler = function eventHandler(_ref3) {
+        var maxFs = _ref3.maxFs;
+        mediaRequest.preferredMaxFs = maxFs;
+        _this4.debouncedSourceUpdateListener();
+      };
+      mediaRequest.handleMaxFs = eventHandler;
       mediaRequest.receiveSlots.forEach(function (rs) {
         rs.on(_receiveSlot.ReceiveSlotEvents.SourceUpdate, _this4.sourceUpdateListener);
-        rs.on(_receiveSlot.ReceiveSlotEvents.MaxFsUpdate, function (_ref3) {
-          var maxFs = _ref3.maxFs;
-          mediaRequest.preferredMaxFs = maxFs;
-          _this4.debouncedSourceUpdateListener();
-        });
+        rs.on(_receiveSlot.ReceiveSlotEvents.MaxFsUpdate, mediaRequest.handleMaxFs);
       });
       if (commit) {
         this.commit();
@@ -222,11 +224,12 @@ var MediaRequestManager = /*#__PURE__*/function () {
   }, {
     key: "cancelRequest",
     value: function cancelRequest(requestId) {
-      var _this$clientRequests$,
-        _this5 = this;
+      var _this5 = this;
       var commit = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-      (_this$clientRequests$ = this.clientRequests[requestId]) === null || _this$clientRequests$ === void 0 ? void 0 : _this$clientRequests$.receiveSlots.forEach(function (rs) {
+      var mediaRequest = this.clientRequests[requestId];
+      mediaRequest === null || mediaRequest === void 0 ? void 0 : mediaRequest.receiveSlots.forEach(function (rs) {
         rs.off(_receiveSlot.ReceiveSlotEvents.SourceUpdate, _this5.sourceUpdateListener);
+        rs.off(_receiveSlot.ReceiveSlotEvents.MaxFsUpdate, mediaRequest.handleMaxFs);
       });
       delete this.clientRequests[requestId];
       if (commit) {

package/dist/multistream/mediaRequestManager.js.map

@@ -1 +1 @@
-{"version":3,"names":["CODEC_DEFAULTS","h264","maxFs","maxFps","maxMbps","DEBOUNCED_SOURCE_UPDATE_TIME","MediaRequestManager","sendMediaRequestsCallback","options","counter","clientRequests","degradationPreferences","kind","sourceUpdateListener","commit","bind","debouncedSourceUpdateListener","sendRequests","maxFsLimits","getMaxFs","totalMacroblocksRequested","forEach","id","mr","codecInfo","Math","min","preferredMaxFs","i","slotsWithLiveSource","receiveSlots","filter","rs","sourceState","length","maxMacroblocksLimit","LoggerProxy","logger","warn","streamRequestA","streamRequestB","_toJmpStreamRequest","newRequests","previousStreamRequests","every","req","idx","isEqual","mediaRequest","RecommendedOpusBitrates","FB_MONO_MUSIC","getRecommendedMaxBitrateForFrameSize","streamRequests","getDegradedClientRequests","push","StreamRequest","policyInfo","policy","Policy","ActiveSpeaker","ReceiverSelected","ActiveSpeakerInfo","priority","crossPriorityDuplication","crossPolicyDuplication","preferLiveVideo","ReceiverSelectedInfo","csi","map","receiveSlot","wcmeReceiveSlot","getMaxPayloadBitsPerSecond","WcmeCodecInfo","H264Codec","getH264MaxMbps","maxWidth","maxHeight","checkIsNewRequestsEqualToPrev","info","newId","on","ReceiveSlotEvents","SourceUpdate","MaxFsUpdate","requestId","off"],"sources":["mediaRequestManager.ts"],"sourcesContent":["/* eslint-disable require-jsdoc */\nimport {\n  StreamRequest,\n  Policy,\n  ActiveSpeakerInfo,\n  ReceiverSelectedInfo,\n  CodecInfo as WcmeCodecInfo,\n  H264Codec,\n  getRecommendedMaxBitrateForFrameSize,\n  RecommendedOpusBitrates,\n} from '@webex/internal-media-core';\nimport {cloneDeep, debounce, isEmpty} from 'lodash';\n\nimport LoggerProxy from '../common/logs/logger-proxy';\n\nimport {ReceiveSlot, ReceiveSlotEvents} 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  preferredMaxFs?: number;\n}\n\nexport type MediaRequestId = string;\n\nconst CODEC_DEFAULTS = {\n  h264: {\n    maxFs: 8192,\n    maxFps: 3000,\n    maxMbps: 245760,\n  },\n};\n\nconst DEBOUNCED_SOURCE_UPDATE_TIME = 1000;\n\ntype DegradationPreferences = {\n  maxMacroblocksLimit: number;\n};\n\ntype SendMediaRequestsCallback = (streamRequests: StreamRequest[]) => void;\ntype Kind = 'audio' | 'video';\n\ntype Options = {\n  degradationPreferences: DegradationPreferences;\n  kind: Kind;\n};\nexport class MediaRequestManager {\n  private sendMediaRequestsCallback: SendMediaRequestsCallback;\n\n  private kind: Kind;\n\n  private counter: number;\n\n  private clientRequests: {[key: MediaRequestId]: MediaRequest};\n\n  private degradationPreferences: DegradationPreferences;\n\n  private sourceUpdateListener: () => void;\n\n  private debouncedSourceUpdateListener: () => void;\n\n  private previousStreamRequests: Array<StreamRequest> = [];\n\n  constructor(sendMediaRequestsCallback: SendMediaRequestsCallback, options: Options) {\n    this.sendMediaRequestsCallback = sendMediaRequestsCallback;\n    this.counter = 0;\n    this.clientRequests = {};\n    this.degradationPreferences = options.degradationPreferences;\n    this.kind = options.kind;\n    this.sourceUpdateListener = this.commit.bind(this);\n    this.debouncedSourceUpdateListener = debounce(\n      this.sourceUpdateListener,\n      DEBOUNCED_SOURCE_UPDATE_TIME\n    );\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.preferredMaxFs || CODEC_DEFAULTS.h264.maxFs,\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  /**\n   * Returns true if two stream requests are the same, false otherwise.\n   *\n   * @param {StreamRequest} streamRequestA - Stream request A for comparison.\n   * @param {StreamRequest} streamRequestB - Stream request B for comparison.\n   * @returns {boolean} - Whether they are equal.\n   */\n  // eslint-disable-next-line class-methods-use-this\n  public isEqual(streamRequestA: StreamRequest, streamRequestB: StreamRequest) {\n    return (\n      JSON.stringify(streamRequestA._toJmpStreamRequest()) ===\n      JSON.stringify(streamRequestB._toJmpStreamRequest())\n    );\n  }\n\n  /**\n   * Compares new stream requests to previous ones and determines\n   * if they are the same.\n   *\n   * @param {StreamRequest[]} newRequests - Array with new requests.\n   * @returns {boolean} - True if they are equal, false otherwise.\n   */\n  private checkIsNewRequestsEqualToPrev(newRequests: StreamRequest[]) {\n    return (\n      !isEmpty(this.previousStreamRequests) &&\n      this.previousStreamRequests.length === newRequests.length &&\n      this.previousStreamRequests.every((req, idx) => this.isEqual(req, newRequests[idx]))\n    );\n  }\n\n  /**\n   * Returns the maxPayloadBitsPerSecond per Stream\n   *\n   * If MediaRequestManager kind is \"audio\", a constant bitrate will be returned.\n   * If MediaRequestManager kind is \"video\", the bitrate will be calculated based\n   * on maxFs (default h264 maxFs as fallback if maxFs is not defined)\n   *\n   * @param {MediaRequest} mediaRequest  - mediaRequest to take data from\n   * @returns {number} maxPayloadBitsPerSecond\n   */\n  private getMaxPayloadBitsPerSecond(mediaRequest: MediaRequest): number {\n    if (this.kind === 'audio') {\n      // return mono_music bitrate default if the kind of mediarequest manager is audio:\n      return RecommendedOpusBitrates.FB_MONO_MUSIC;\n    }\n\n    return getRecommendedMaxBitrateForFrameSize(\n      mediaRequest.codecInfo.maxFs || CODEC_DEFAULTS.h264.maxFs\n    );\n  }\n\n  /**\n   * Returns the max Macro Blocks per second (maxMbps) per H264 Stream\n   *\n   * The maxMbps will be calculated based on maxFs and maxFps\n   * (default h264 maxFps as fallback if maxFps is not defined)\n   *\n   * @param {MediaRequest} mediaRequest  - mediaRequest to take data from\n   * @returns {number} maxMbps\n   */\n  // eslint-disable-next-line class-methods-use-this\n  private getH264MaxMbps(mediaRequest: MediaRequest): number {\n    // fallback for maxFps (not needed for maxFs, since there is a fallback already in getDegradedClientRequests)\n    const maxFps = mediaRequest.codecInfo.maxFps || CODEC_DEFAULTS.h264.maxFps;\n\n    // divided by 100 since maxFps is 3000 (for 30 frames per seconds)\n    return (mediaRequest.codecInfo.maxFs * maxFps) / 100;\n  }\n\n  /**\n   * Clears the previous stream requests.\n   *\n   * @returns {void}\n   */\n  public clearPreviousRequests(): void {\n    this.previousStreamRequests = [];\n  }\n\n  private sendRequests() {\n    const streamRequests: StreamRequest[] = [];\n\n    const clientRequests = this.getDegradedClientRequests();\n\n    // map all the client media requests to wcme stream requests\n    Object.values(clientRequests).forEach((mr) => {\n      streamRequests.push(\n        new StreamRequest(\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          this.getMaxPayloadBitsPerSecond(mr),\n          mr.codecInfo && [\n            new WcmeCodecInfo(\n              0x80,\n              new H264Codec(\n                mr.codecInfo.maxFs,\n                mr.codecInfo.maxFps || CODEC_DEFAULTS.h264.maxFps,\n                this.getH264MaxMbps(mr),\n                mr.codecInfo.maxWidth,\n                mr.codecInfo.maxHeight\n              )\n            ),\n          ]\n        )\n      );\n    });\n\n    //! IMPORTANT: this is only a temporary fix. This will soon be done in the jmp layer (@webex/json-multistream)\n    // https://jira-eng-gpk2.cisco.com/jira/browse/WEBEX-326713\n    if (!this.checkIsNewRequestsEqualToPrev(streamRequests)) {\n      this.sendMediaRequestsCallback(streamRequests);\n      this.previousStreamRequests = streamRequests;\n      LoggerProxy.logger.info(`multistream:sendRequests --> media requests sent. `);\n    } else {\n      LoggerProxy.logger.info(\n        `multistream:sendRequests --> detected duplicate WCME requests, skipping them... `\n      );\n    }\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      rs.on(ReceiveSlotEvents.MaxFsUpdate, ({maxFs}) => {\n        mediaRequest.preferredMaxFs = maxFs;\n        this.debouncedSourceUpdateListener();\n      });\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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"}
+{"version":3,"names":["CODEC_DEFAULTS","h264","maxFs","maxFps","maxMbps","DEBOUNCED_SOURCE_UPDATE_TIME","MediaRequestManager","sendMediaRequestsCallback","options","counter","clientRequests","degradationPreferences","kind","sourceUpdateListener","commit","bind","debouncedSourceUpdateListener","sendRequests","maxFsLimits","getMaxFs","totalMacroblocksRequested","forEach","id","mr","codecInfo","Math","min","preferredMaxFs","i","slotsWithLiveSource","receiveSlots","filter","rs","sourceState","length","maxMacroblocksLimit","LoggerProxy","logger","warn","streamRequestA","streamRequestB","_toJmpStreamRequest","newRequests","previousStreamRequests","every","req","idx","isEqual","mediaRequest","RecommendedOpusBitrates","FB_MONO_MUSIC","getRecommendedMaxBitrateForFrameSize","streamRequests","getDegradedClientRequests","push","StreamRequest","policyInfo","policy","Policy","ActiveSpeaker","ReceiverSelected","ActiveSpeakerInfo","priority","crossPriorityDuplication","crossPolicyDuplication","preferLiveVideo","ReceiverSelectedInfo","csi","map","receiveSlot","wcmeReceiveSlot","getMaxPayloadBitsPerSecond","WcmeCodecInfo","H264Codec","getH264MaxMbps","maxWidth","maxHeight","checkIsNewRequestsEqualToPrev","info","newId","eventHandler","handleMaxFs","on","ReceiveSlotEvents","SourceUpdate","MaxFsUpdate","requestId","off"],"sources":["mediaRequestManager.ts"],"sourcesContent":["/* eslint-disable require-jsdoc */\nimport {\n  StreamRequest,\n  Policy,\n  ActiveSpeakerInfo,\n  ReceiverSelectedInfo,\n  CodecInfo as WcmeCodecInfo,\n  H264Codec,\n  getRecommendedMaxBitrateForFrameSize,\n  RecommendedOpusBitrates,\n} from '@webex/internal-media-core';\nimport {cloneDeep, debounce, isEmpty} from 'lodash';\n\nimport LoggerProxy from '../common/logs/logger-proxy';\n\nimport {ReceiveSlot, ReceiveSlotEvents} 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  preferredMaxFs?: number;\n  handleMaxFs?: ({maxFs}: {maxFs: number}) => void;\n}\n\nexport type MediaRequestId = string;\n\nconst CODEC_DEFAULTS = {\n  h264: {\n    maxFs: 8192,\n    maxFps: 3000,\n    maxMbps: 245760,\n  },\n};\n\nconst DEBOUNCED_SOURCE_UPDATE_TIME = 1000;\n\ntype DegradationPreferences = {\n  maxMacroblocksLimit: number;\n};\n\ntype SendMediaRequestsCallback = (streamRequests: StreamRequest[]) => void;\ntype Kind = 'audio' | 'video';\n\ntype Options = {\n  degradationPreferences: DegradationPreferences;\n  kind: Kind;\n};\nexport class MediaRequestManager {\n  private sendMediaRequestsCallback: SendMediaRequestsCallback;\n\n  private kind: Kind;\n\n  private counter: number;\n\n  private clientRequests: {[key: MediaRequestId]: MediaRequest};\n\n  private degradationPreferences: DegradationPreferences;\n\n  private sourceUpdateListener: () => void;\n\n  private debouncedSourceUpdateListener: () => void;\n\n  private previousStreamRequests: Array<StreamRequest> = [];\n\n  constructor(sendMediaRequestsCallback: SendMediaRequestsCallback, options: Options) {\n    this.sendMediaRequestsCallback = sendMediaRequestsCallback;\n    this.counter = 0;\n    this.clientRequests = {};\n    this.degradationPreferences = options.degradationPreferences;\n    this.kind = options.kind;\n    this.sourceUpdateListener = this.commit.bind(this);\n    this.debouncedSourceUpdateListener = debounce(\n      this.sourceUpdateListener,\n      DEBOUNCED_SOURCE_UPDATE_TIME\n    );\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.preferredMaxFs || CODEC_DEFAULTS.h264.maxFs,\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  /**\n   * Returns true if two stream requests are the same, false otherwise.\n   *\n   * @param {StreamRequest} streamRequestA - Stream request A for comparison.\n   * @param {StreamRequest} streamRequestB - Stream request B for comparison.\n   * @returns {boolean} - Whether they are equal.\n   */\n  // eslint-disable-next-line class-methods-use-this\n  public isEqual(streamRequestA: StreamRequest, streamRequestB: StreamRequest) {\n    return (\n      JSON.stringify(streamRequestA._toJmpStreamRequest()) ===\n      JSON.stringify(streamRequestB._toJmpStreamRequest())\n    );\n  }\n\n  /**\n   * Compares new stream requests to previous ones and determines\n   * if they are the same.\n   *\n   * @param {StreamRequest[]} newRequests - Array with new requests.\n   * @returns {boolean} - True if they are equal, false otherwise.\n   */\n  private checkIsNewRequestsEqualToPrev(newRequests: StreamRequest[]) {\n    return (\n      !isEmpty(this.previousStreamRequests) &&\n      this.previousStreamRequests.length === newRequests.length &&\n      this.previousStreamRequests.every((req, idx) => this.isEqual(req, newRequests[idx]))\n    );\n  }\n\n  /**\n   * Returns the maxPayloadBitsPerSecond per Stream\n   *\n   * If MediaRequestManager kind is \"audio\", a constant bitrate will be returned.\n   * If MediaRequestManager kind is \"video\", the bitrate will be calculated based\n   * on maxFs (default h264 maxFs as fallback if maxFs is not defined)\n   *\n   * @param {MediaRequest} mediaRequest  - mediaRequest to take data from\n   * @returns {number} maxPayloadBitsPerSecond\n   */\n  private getMaxPayloadBitsPerSecond(mediaRequest: MediaRequest): number {\n    if (this.kind === 'audio') {\n      // return mono_music bitrate default if the kind of mediarequest manager is audio:\n      return RecommendedOpusBitrates.FB_MONO_MUSIC;\n    }\n\n    return getRecommendedMaxBitrateForFrameSize(\n      mediaRequest.codecInfo.maxFs || CODEC_DEFAULTS.h264.maxFs\n    );\n  }\n\n  /**\n   * Returns the max Macro Blocks per second (maxMbps) per H264 Stream\n   *\n   * The maxMbps will be calculated based on maxFs and maxFps\n   * (default h264 maxFps as fallback if maxFps is not defined)\n   *\n   * @param {MediaRequest} mediaRequest  - mediaRequest to take data from\n   * @returns {number} maxMbps\n   */\n  // eslint-disable-next-line class-methods-use-this\n  private getH264MaxMbps(mediaRequest: MediaRequest): number {\n    // fallback for maxFps (not needed for maxFs, since there is a fallback already in getDegradedClientRequests)\n    const maxFps = mediaRequest.codecInfo.maxFps || CODEC_DEFAULTS.h264.maxFps;\n\n    // divided by 100 since maxFps is 3000 (for 30 frames per seconds)\n    return (mediaRequest.codecInfo.maxFs * maxFps) / 100;\n  }\n\n  /**\n   * Clears the previous stream requests.\n   *\n   * @returns {void}\n   */\n  public clearPreviousRequests(): void {\n    this.previousStreamRequests = [];\n  }\n\n  private sendRequests() {\n    const streamRequests: StreamRequest[] = [];\n\n    const clientRequests = this.getDegradedClientRequests();\n\n    // map all the client media requests to wcme stream requests\n    Object.values(clientRequests).forEach((mr) => {\n      streamRequests.push(\n        new StreamRequest(\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          this.getMaxPayloadBitsPerSecond(mr),\n          mr.codecInfo && [\n            new WcmeCodecInfo(\n              0x80,\n              new H264Codec(\n                mr.codecInfo.maxFs,\n                mr.codecInfo.maxFps || CODEC_DEFAULTS.h264.maxFps,\n                this.getH264MaxMbps(mr),\n                mr.codecInfo.maxWidth,\n                mr.codecInfo.maxHeight\n              )\n            ),\n          ]\n        )\n      );\n    });\n\n    //! IMPORTANT: this is only a temporary fix. This will soon be done in the jmp layer (@webex/json-multistream)\n    // https://jira-eng-gpk2.cisco.com/jira/browse/WEBEX-326713\n    if (!this.checkIsNewRequestsEqualToPrev(streamRequests)) {\n      this.sendMediaRequestsCallback(streamRequests);\n      this.previousStreamRequests = streamRequests;\n      LoggerProxy.logger.info(`multistream:sendRequests --> media requests sent. `);\n    } else {\n      LoggerProxy.logger.info(\n        `multistream:sendRequests --> detected duplicate WCME requests, skipping them... `\n      );\n    }\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    const eventHandler = ({maxFs}) => {\n      mediaRequest.preferredMaxFs = maxFs;\n      this.debouncedSourceUpdateListener();\n    };\n    mediaRequest.handleMaxFs = eventHandler;\n\n    mediaRequest.receiveSlots.forEach((rs) => {\n      rs.on(ReceiveSlotEvents.SourceUpdate, this.sourceUpdateListener);\n      rs.on(ReceiveSlotEvents.MaxFsUpdate, mediaRequest.handleMaxFs);\n    });\n\n    if (commit) {\n      this.commit();\n    }\n\n    return newId;\n  }\n\n  public cancelRequest(requestId: MediaRequestId, commit = true) {\n    const mediaRequest = this.clientRequests[requestId];\n\n    mediaRequest?.receiveSlots.forEach((rs) => {\n      rs.off(ReceiveSlotEvents.SourceUpdate, this.sourceUpdateListener);\n      rs.off(ReceiveSlotEvents.MaxFsUpdate, mediaRequest.handleMaxFs);\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/types/multistream/mediaRequestManager.d.ts

@@ -26,6 +26,9 @@ export interface MediaRequest {
     receiveSlots: Array<ReceiveSlot>;
     codecInfo?: CodecInfo;
     preferredMaxFs?: number;
+    handleMaxFs?: ({ maxFs }: {
+        maxFs: number;
+    }) => void;
 }
 export type MediaRequestId = string;
 type DegradationPreferences = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/plugin-meetings",
-  "version": "3.0.0-beta.140",
+  "version": "3.0.0-beta.141",
   "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.140",
-    "@webex/test-helper-chai": "3.0.0-beta.140",
-    "@webex/test-helper-mocha": "3.0.0-beta.140",
-    "@webex/test-helper-mock-webex": "3.0.0-beta.140",
-    "@webex/test-helper-retry": "3.0.0-beta.140",
-    "@webex/test-helper-test-users": "3.0.0-beta.140",
+    "@webex/plugin-meetings": "3.0.0-beta.141",
+    "@webex/test-helper-chai": "3.0.0-beta.141",
+    "@webex/test-helper-mocha": "3.0.0-beta.141",
+    "@webex/test-helper-mock-webex": "3.0.0-beta.141",
+    "@webex/test-helper-retry": "3.0.0-beta.141",
+    "@webex/test-helper-test-users": "3.0.0-beta.141",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "jsdom-global": "3.0.2",
@@ -46,19 +46,19 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@webex/common": "3.0.0-beta.140",
+    "@webex/common": "3.0.0-beta.141",
     "@webex/internal-media-core": "1.38.2",
-    "@webex/internal-plugin-conversation": "3.0.0-beta.140",
-    "@webex/internal-plugin-device": "3.0.0-beta.140",
-    "@webex/internal-plugin-llm": "3.0.0-beta.140",
-    "@webex/internal-plugin-mercury": "3.0.0-beta.140",
-    "@webex/internal-plugin-metrics": "3.0.0-beta.140",
-    "@webex/internal-plugin-support": "3.0.0-beta.140",
-    "@webex/internal-plugin-user": "3.0.0-beta.140",
-    "@webex/media-helpers": "3.0.0-beta.140",
-    "@webex/plugin-people": "3.0.0-beta.140",
-    "@webex/plugin-rooms": "3.0.0-beta.140",
-    "@webex/webex-core": "3.0.0-beta.140",
+    "@webex/internal-plugin-conversation": "3.0.0-beta.141",
+    "@webex/internal-plugin-device": "3.0.0-beta.141",
+    "@webex/internal-plugin-llm": "3.0.0-beta.141",
+    "@webex/internal-plugin-mercury": "3.0.0-beta.141",
+    "@webex/internal-plugin-metrics": "3.0.0-beta.141",
+    "@webex/internal-plugin-support": "3.0.0-beta.141",
+    "@webex/internal-plugin-user": "3.0.0-beta.141",
+    "@webex/media-helpers": "3.0.0-beta.141",
+    "@webex/plugin-people": "3.0.0-beta.141",
+    "@webex/plugin-rooms": "3.0.0-beta.141",
+    "@webex/webex-core": "3.0.0-beta.141",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",

package/src/multistream/mediaRequestManager.ts

@@ -47,6 +47,7 @@ export interface MediaRequest {
   receiveSlots: Array<ReceiveSlot>;
   codecInfo?: CodecInfo;
   preferredMaxFs?: number;
+  handleMaxFs?: ({maxFs}: {maxFs: number}) => void;
 }
 
 export type MediaRequestId = string;
@@ -287,12 +288,15 @@ export class MediaRequestManager {
 
     this.clientRequests[newId] = mediaRequest;
 
+    const eventHandler = ({maxFs}) => {
+      mediaRequest.preferredMaxFs = maxFs;
+      this.debouncedSourceUpdateListener();
+    };
+    mediaRequest.handleMaxFs = eventHandler;
+
     mediaRequest.receiveSlots.forEach((rs) => {
       rs.on(ReceiveSlotEvents.SourceUpdate, this.sourceUpdateListener);
-      rs.on(ReceiveSlotEvents.MaxFsUpdate, ({maxFs}) => {
-        mediaRequest.preferredMaxFs = maxFs;
-        this.debouncedSourceUpdateListener();
-      });
+      rs.on(ReceiveSlotEvents.MaxFsUpdate, mediaRequest.handleMaxFs);
     });
 
     if (commit) {
@@ -303,8 +307,11 @@ export class MediaRequestManager {
   }
 
   public cancelRequest(requestId: MediaRequestId, commit = true) {
-    this.clientRequests[requestId]?.receiveSlots.forEach((rs) => {
+    const mediaRequest = this.clientRequests[requestId];
+
+    mediaRequest?.receiveSlots.forEach((rs) => {
       rs.off(ReceiveSlotEvents.SourceUpdate, this.sourceUpdateListener);
+      rs.off(ReceiveSlotEvents.MaxFsUpdate, mediaRequest.handleMaxFs);
     });
 
     delete this.clientRequests[requestId];

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

@@ -5,6 +5,8 @@ import {assert} from '@webex/test-helper-chai';
 import {getMaxFs} from '@webex/plugin-meetings/src/multistream/remoteMedia';
 import FakeTimers from '@sinonjs/fake-timers';
 import * as mediaCore from '@webex/internal-media-core';
+import { assertFunction } from '@babel/types';
+import { expect } from 'chai';
 
 type ExpectedActiveSpeaker = {
   policy: 'active-speaker';
@@ -79,7 +81,7 @@ describe('MediaRequestManager', () => {
   });
 
   // helper function for adding an active speaker request
-  const addActiveSpeakerRequest = (priority, receiveSlots, maxFs, commit = false) =>
+  const addActiveSpeakerRequest = (priority, receiveSlots, maxFs, commit = false) => 
     mediaRequestManager.addRequest(
       {
         policyInfo: {
@@ -381,6 +383,26 @@ describe('MediaRequestManager', () => {
     ]);
   });
 
+  it('removes the events maxFsUpdate and sourceUpdate when cancelRequest() is called', async () => {
+
+    const requestId = addActiveSpeakerRequest(255, [fakeReceiveSlots[2], fakeReceiveSlots[3]], MAX_FS_720p);
+
+    mediaRequestManager.cancelRequest(requestId, true);
+
+    const sourceUpdateHandler = fakeReceiveSlots[2].off.getCall(0);
+
+    const maxFsHandlerCall = fakeReceiveSlots[2].off.getCall(1);
+
+    const maxFsEventName = maxFsHandlerCall.args[0];
+    const sourceUpdateEventName = sourceUpdateHandler.args[0];
+
+    expect(sourceUpdateHandler.args[1]).to.be.a('function');
+    expect(maxFsHandlerCall.args[1]).to.be.a('function');
+
+    assert.equal(maxFsEventName, 'maxFsUpdate')
+    assert.equal(sourceUpdateEventName, 'sourceUpdate')
+  });
+
   it('cancels the requests correctly when cancelRequest() is called with commit=true', () => {
     const requestIds = [
       addActiveSpeakerRequest(255, [fakeReceiveSlots[0], fakeReceiveSlots[1]], MAX_FS_720p),
@@ -1058,3 +1080,7 @@ describe('MediaRequestManager', () => {
     });
   });
 });
+function assertEqual(arg0: any, arg1: string) {
+  throw new Error('Function not implemented.');
+}
+