@webex/plugin-meetings 3.0.0-beta.76 → 3.0.0-beta.78

package/dist/multistream/mediaRequestManager.js

@@ -31,9 +31,10 @@ var CODEC_DEFAULTS = {
 };
 var DEBOUNCED_SOURCE_UPDATE_TIME = 1000;
 var MediaRequestManager = /*#__PURE__*/function () {
-  function MediaRequestManager(degradationPreferences, sendMediaRequestsCallback) {
+  function MediaRequestManager(sendMediaRequestsCallback, options) {
     (0, _classCallCheck2.default)(this, MediaRequestManager);
     (0, _defineProperty2.default)(this, "sendMediaRequestsCallback", void 0);
+    (0, _defineProperty2.default)(this, "kind", void 0);
     (0, _defineProperty2.default)(this, "counter", void 0);
     (0, _defineProperty2.default)(this, "clientRequests", void 0);
     (0, _defineProperty2.default)(this, "degradationPreferences", void 0);
@@ -43,7 +44,8 @@ var MediaRequestManager = /*#__PURE__*/function () {
     this.sendMediaRequestsCallback = sendMediaRequestsCallback;
     this.counter = 0;
     this.clientRequests = {};
-    this.degradationPreferences = degradationPreferences;
+    this.degradationPreferences = options.degradationPreferences;
+    this.kind = options.kind;
     this.sourceUpdateListener = this.commit.bind(this);
     this.debouncedSourceUpdateListener = (0, _debounce2.default)(this.sourceUpdateListener, DEBOUNCED_SOURCE_UPDATE_TIME);
   }
@@ -122,6 +124,46 @@ var MediaRequestManager = /*#__PURE__*/function () {
       });
     }
 
+    /**
+     * Returns the maxPayloadBitsPerSecond per Stream
+     *
+     * If MediaRequestManager kind is "audio", a constant bitrate will be returned.
+     * If MediaRequestManager kind is "video", the bitrate will be calculated based
+     * on maxFs (default h264 maxFs as fallback if maxFs is not defined)
+     *
+     * @param {MediaRequest} mediaRequest  - mediaRequest to take data from
+     * @returns {number} maxPayloadBitsPerSecond
+     */
+  }, {
+    key: "getMaxPayloadBitsPerSecond",
+    value: function getMaxPayloadBitsPerSecond(mediaRequest) {
+      if (this.kind === 'audio') {
+        // return mono_music bitrate default if the kind of mediarequest manager is audio:
+        return _internalMediaCore.RecommendedOpusBitrates.FB_MONO_MUSIC;
+      }
+      return (0, _internalMediaCore.getRecommendedMaxBitrateForFrameSize)(mediaRequest.codecInfo.maxFs || CODEC_DEFAULTS.h264.maxFs);
+    }
+
+    /**
+     * Returns the max Macro Blocks per second (maxMbps) per H264 Stream
+     *
+     * The maxMbps will be calculated based on maxFs and maxFps
+     * (default h264 maxFps as fallback if maxFps is not defined)
+     *
+     * @param {MediaRequest} mediaRequest  - mediaRequest to take data from
+     * @returns {number} maxMbps
+     */
+    // eslint-disable-next-line class-methods-use-this
+  }, {
+    key: "getH264MaxMbps",
+    value: function getH264MaxMbps(mediaRequest) {
+      // fallback for maxFps (not needed for maxFs, since there is a fallback already in getDegradedClientRequests)
+      var maxFps = mediaRequest.codecInfo.maxFps || CODEC_DEFAULTS.h264.maxFps;
+
+      // divided by 100 since maxFps is 3000 (for 30 frames per seconds)
+      return mediaRequest.codecInfo.maxFs * maxFps / 100;
+    }
+
     /**
      * Clears the previous media requests.
      *
@@ -135,15 +177,15 @@ var MediaRequestManager = /*#__PURE__*/function () {
   }, {
     key: "sendRequests",
     value: function sendRequests() {
+      var _this3 = this;
       var wcmeMediaRequests = [];
       var clientRequests = this.getDegradedClientRequests();
-      var maxPayloadBitsPerSecond = 10 * 1000 * 1000;
 
       // map all the client media requests to wcme media requests
       (0, _values.default)(clientRequests).forEach(function (mr) {
         wcmeMediaRequests.push(new _internalMediaCore.MediaRequest(mr.policyInfo.policy === 'active-speaker' ? _internalMediaCore.Policy.ActiveSpeaker : _internalMediaCore.Policy.ReceiverSelected, mr.policyInfo.policy === 'active-speaker' ? new _internalMediaCore.ActiveSpeakerInfo(mr.policyInfo.priority, mr.policyInfo.crossPriorityDuplication, mr.policyInfo.crossPolicyDuplication, mr.policyInfo.preferLiveVideo) : new _internalMediaCore.ReceiverSelectedInfo(mr.policyInfo.csi), mr.receiveSlots.map(function (receiveSlot) {
           return receiveSlot.wcmeReceiveSlot;
-        }), 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))]));
+        }), _this3.getMaxPayloadBitsPerSecond(mr), mr.codecInfo && [new _internalMediaCore.CodecInfo(0x80, new _internalMediaCore.H264Codec(mr.codecInfo.maxFs, mr.codecInfo.maxFps || CODEC_DEFAULTS.h264.maxFps, _this3.getH264MaxMbps(mr), mr.codecInfo.maxWidth, mr.codecInfo.maxHeight))]));
       });
 
       //! IMPORTANT: this is only a temporary fix. This will soon be done in the jmp layer (@webex/json-multistream)
@@ -159,17 +201,17 @@ var MediaRequestManager = /*#__PURE__*/function () {
   }, {
     key: "addRequest",
     value: function addRequest(mediaRequest) {
-      var _this3 = this;
+      var _this4 = this;
       var commit = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       // eslint-disable-next-line no-plusplus
       var newId = "".concat(this.counter++);
       this.clientRequests[newId] = mediaRequest;
       mediaRequest.receiveSlots.forEach(function (rs) {
-        rs.on(_receiveSlot.ReceiveSlotEvents.SourceUpdate, _this3.sourceUpdateListener);
+        rs.on(_receiveSlot.ReceiveSlotEvents.SourceUpdate, _this4.sourceUpdateListener);
         rs.on(_receiveSlot.ReceiveSlotEvents.MaxFsUpdate, function (_ref3) {
           var maxFs = _ref3.maxFs;
           mediaRequest.preferredMaxFs = maxFs;
-          _this3.debouncedSourceUpdateListener();
+          _this4.debouncedSourceUpdateListener();
         });
       });
       if (commit) {
@@ -181,10 +223,10 @@ var MediaRequestManager = /*#__PURE__*/function () {
     key: "cancelRequest",
     value: function cancelRequest(requestId) {
       var _this$clientRequests$,
-        _this4 = this;
+        _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) {
-        rs.off(_receiveSlot.ReceiveSlotEvents.SourceUpdate, _this4.sourceUpdateListener);
+        rs.off(_receiveSlot.ReceiveSlotEvents.SourceUpdate, _this5.sourceUpdateListener);
       });
       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","degradationPreferences","sendMediaRequestsCallback","counter","clientRequests","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","mediaRequestA","mediaRequestB","_toJmpScrRequest","newRequests","previousWCMEMediaRequests","every","req","idx","isEqual","wcmeMediaRequests","getDegradedClientRequests","maxPayloadBitsPerSecond","push","WcmeMediaRequest","policyInfo","policy","Policy","ActiveSpeaker","ReceiverSelected","ActiveSpeakerInfo","priority","crossPriorityDuplication","crossPolicyDuplication","preferLiveVideo","ReceiverSelectedInfo","csi","map","receiveSlot","wcmeReceiveSlot","WcmeCodecInfo","H264Codec","maxWidth","maxHeight","checkIsNewRequestsEqualToPrev","info","mediaRequest","newId","on","ReceiveSlotEvents","SourceUpdate","MaxFsUpdate","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, 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 = (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  private debouncedSourceUpdateListener: () => void;\n\n  private previousWCMEMediaRequests: Array<WcmeMediaRequest> = [];\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    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 media requests are the same, false otherwise.\n   *\n   * @param {WcmeMediaRequest} mediaRequestA - Media request A for comparison.\n   * @param {WcmeMediaRequest} mediaRequestB - Media request B for comparison.\n   * @returns {boolean} - Whether they are equal.\n   */\n  // eslint-disable-next-line class-methods-use-this\n  public isEqual(mediaRequestA: WcmeMediaRequest, mediaRequestB: WcmeMediaRequest) {\n    return (\n      JSON.stringify(mediaRequestA._toJmpScrRequest()) ===\n      JSON.stringify(mediaRequestB._toJmpScrRequest())\n    );\n  }\n\n  /**\n   * Compares new media requests to previous ones and determines\n   * if they are the same.\n   *\n   * @param {WcmeMediaRequest[]} newRequests - Array with new requests.\n   * @returns {boolean} - True if they are equal, false otherwise.\n   */\n  private checkIsNewRequestsEqualToPrev(newRequests: WcmeMediaRequest[]) {\n    return (\n      !isEmpty(this.previousWCMEMediaRequests) &&\n      this.previousWCMEMediaRequests.length === newRequests.length &&\n      this.previousWCMEMediaRequests.every((req, idx) => this.isEqual(req, newRequests[idx]))\n    );\n  }\n\n  /**\n   * Clears the previous media requests.\n   *\n   * @returns {void}\n   */\n  public clearPreviousRequests(): void {\n    this.previousWCMEMediaRequests = [];\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    //! 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(wcmeMediaRequests)) {\n      this.sendMediaRequestsCallback(wcmeMediaRequests);\n      this.previousWCMEMediaRequests = wcmeMediaRequests;\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":";;;;;;;;;;;;;;;;;;AACA;AAUA;AAEA;AACA;AAdA;;AAmDA,IAAMA,cAAc,GAAG;EACrBC,IAAI,EAAE;IACJC,KAAK,EAAE,IAAI;IACXC,MAAM,EAAE,IAAI;IACZC,OAAO,EAAE;EACX;AACF,CAAC;AAED,IAAMC,4BAA4B,GAAG,IAAI;AAAC,IAQ7BC,mBAAmB;EAe9B,6BACEC,sBAA8C,EAC9CC,yBAAoD,EACpD;IAAA;IAAA;IAAA;IAAA;IAAA;IAAA;IAAA;IAAA,iEAL2D,EAAE;IAM7D,IAAI,CAACA,yBAAyB,GAAGA,yBAAyB;IAC1D,IAAI,CAACC,OAAO,GAAG,CAAC;IAChB,IAAI,CAACC,cAAc,GAAG,CAAC,CAAC;IACxB,IAAI,CAACH,sBAAsB,GAAGA,sBAAsB;IACpD,IAAI,CAACI,oBAAoB,GAAG,IAAI,CAACC,MAAM,CAACC,IAAI,CAAC,IAAI,CAAC;IAClD,IAAI,CAACC,6BAA6B,GAAG,wBACnC,IAAI,CAACH,oBAAoB,EACzBN,4BAA4B,CAC7B;EACH;EAAC;IAAA;IAAA,OAED,mCAAiCE,sBAA8C,EAAE;MAC/E,IAAI,CAACA,sBAAsB,GAAGA,sBAAsB;MACpD,IAAI,CAACQ,YAAY,EAAE,CAAC,CAAC;IACvB;EAAC;IAAA;IAAA,OAED,qCAAoC;MAAA;MAClC,IAAML,cAAc,GAAG,yBAAU,IAAI,CAACA,cAAc,CAAC;MACrD,IAAMM,WAAW,GAAG,CAClB,IAAAC,qBAAQ,EAAC,MAAM,CAAC,EAChB,IAAAA,qBAAQ,EAAC,OAAO,CAAC,EACjB,IAAAA,qBAAQ,EAAC,QAAQ,CAAC,EAClB,IAAAA,qBAAQ,EAAC,OAAO,CAAC,EACjB,IAAAA,qBAAQ,EAAC,YAAY,CAAC,EACtB,IAAAA,qBAAQ,EAAC,WAAW,CAAC,CACtB;;MAED;MAAA,8BACgD;QAC9C,IAAIC,yBAAyB,GAAG,CAAC;QACjC,sBAAeR,cAAc,CAAC,CAACS,OAAO,CAAC,gBAAc;UAAA;YAAZC,EAAE;YAAEC,EAAE;UAC7C,IAAIA,EAAE,CAACC,SAAS,EAAE;YAChBD,EAAE,CAACC,SAAS,CAACpB,KAAK,GAAGqB,IAAI,CAACC,GAAG,CAC3BH,EAAE,CAACI,cAAc,IAAIzB,cAAc,CAACC,IAAI,CAACC,KAAK,EAC9CmB,EAAE,CAACC,SAAS,CAACpB,KAAK,IAAIF,cAAc,CAACC,IAAI,CAACC,KAAK,EAC/Cc,WAAW,CAACU,CAAC,CAAC,CACf;YACD;YACA,IAAMC,mBAAmB,GAAG,KAAI,CAACjB,cAAc,CAACU,EAAE,CAAC,CAACQ,YAAY,CAACC,MAAM,CACrE,UAACC,EAAE;cAAA,OAAKA,EAAE,CAACC,WAAW,KAAK,MAAM;YAAA,EAClC;YACDb,yBAAyB,IAAIG,EAAE,CAACC,SAAS,CAACpB,KAAK,GAAGyB,mBAAmB,CAACK,MAAM;UAC9E;QACF,CAAC,CAAC;QACF,IAAId,yBAAyB,IAAI,KAAI,CAACX,sBAAsB,CAAC0B,mBAAmB,EAAE;UAChF,IAAIP,CAAC,KAAK,CAAC,EAAE;YACXQ,oBAAW,CAACC,MAAM,CAACC,IAAI,gHACmFpB,WAAW,CAACU,CAAC,CAAC,EACvH;UACH;UAAC;QAEH,CAAC,MAAM,IAAIA,CAAC,KAAKV,WAAW,CAACgB,MAAM,GAAG,CAAC,EAAE;UACvCE,oBAAW,CAACC,MAAM,CAACC,IAAI,+EACkDpB,WAAW,CAACU,CAAC,CAAC,0FACtF;QACH;MACF,CAAC;MA5BD,KAAK,IAAIA,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGV,WAAW,CAACgB,MAAM,EAAEN,CAAC,IAAI,CAAC;QAAA;QAAA,sBAsB1C;MAAM;MAQV,OAAOhB,cAAc;IACvB;;IAEA;AACF;AACA;AACA;AACA;AACA;AACA;IACE;EAAA;IAAA;IAAA,OACA,iBAAe2B,aAA+B,EAAEC,aAA+B,EAAE;MAC/E,OACE,wBAAeD,aAAa,CAACE,gBAAgB,EAAE,CAAC,KAChD,wBAAeD,aAAa,CAACC,gBAAgB,EAAE,CAAC;IAEpD;;IAEA;AACF;AACA;AACA;AACA;AACA;AACA;EANE;IAAA;IAAA,OAOA,uCAAsCC,WAA+B,EAAE;MAAA;MACrE,OACE,CAAC,uBAAQ,IAAI,CAACC,yBAAyB,CAAC,IACxC,IAAI,CAACA,yBAAyB,CAACT,MAAM,KAAKQ,WAAW,CAACR,MAAM,IAC5D,IAAI,CAACS,yBAAyB,CAACC,KAAK,CAAC,UAACC,GAAG,EAAEC,GAAG;QAAA,OAAK,MAAI,CAACC,OAAO,CAACF,GAAG,EAAEH,WAAW,CAACI,GAAG,CAAC,CAAC;MAAA,EAAC;IAE3F;;IAEA;AACF;AACA;AACA;AACA;EAJE;IAAA;IAAA,OAKA,iCAAqC;MACnC,IAAI,CAACH,yBAAyB,GAAG,EAAE;IACrC;EAAC;IAAA;IAAA,OAED,wBAAuB;MACrB,IAAMK,iBAAqC,GAAG,EAAE;MAEhD,IAAMpC,cAAc,GAAG,IAAI,CAACqC,yBAAyB,EAAE;MACvD,IAAMC,uBAAuB,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI;;MAEhD;MACA,qBAActC,cAAc,CAAC,CAACS,OAAO,CAAC,UAACE,EAAE,EAAK;QAC5CyB,iBAAiB,CAACG,IAAI,CACpB,IAAIC,+BAAgB,CAClB7B,EAAE,CAAC8B,UAAU,CAACC,MAAM,KAAK,gBAAgB,GACrCC,yBAAM,CAACC,aAAa,GACpBD,yBAAM,CAACE,gBAAgB,EAC3BlC,EAAE,CAAC8B,UAAU,CAACC,MAAM,KAAK,gBAAgB,GACrC,IAAII,oCAAiB,CACnBnC,EAAE,CAAC8B,UAAU,CAACM,QAAQ,EACtBpC,EAAE,CAAC8B,UAAU,CAACO,wBAAwB,EACtCrC,EAAE,CAAC8B,UAAU,CAACQ,sBAAsB,EACpCtC,EAAE,CAAC8B,UAAU,CAACS,eAAe,CAC9B,GACD,IAAIC,uCAAoB,CAACxC,EAAE,CAAC8B,UAAU,CAACW,GAAG,CAAC,EAC/CzC,EAAE,CAACO,YAAY,CAACmC,GAAG,CAAC,UAACC,WAAW;UAAA,OAAKA,WAAW,CAACC,eAAe;QAAA,EAAC,EACjEjB,uBAAuB,EACvB3B,EAAE,CAACC,SAAS,IAAI,CACd,IAAI4C,4BAAa,CACf,IAAI,EACJ,IAAIC,4BAAS,CACX9C,EAAE,CAACC,SAAS,CAACpB,KAAK,EAClBmB,EAAE,CAACC,SAAS,CAACnB,MAAM,IAAIH,cAAc,CAACC,IAAI,CAACE,MAAM,EACjDkB,EAAE,CAACC,SAAS,CAAClB,OAAO,IAAIJ,cAAc,CAACC,IAAI,CAACG,OAAO,EACnDiB,EAAE,CAACC,SAAS,CAAC8C,QAAQ,EACrB/C,EAAE,CAACC,SAAS,CAAC+C,SAAS,CACvB,CACF,CACF,CACF,CACF;MACH,CAAC,CAAC;;MAEF;MACA;MACA,IAAI,CAAC,IAAI,CAACC,6BAA6B,CAACxB,iBAAiB,CAAC,EAAE;QAC1D,IAAI,CAACtC,yBAAyB,CAACsC,iBAAiB,CAAC;QACjD,IAAI,CAACL,yBAAyB,GAAGK,iBAAiB;QAClDZ,oBAAW,CAACC,MAAM,CAACoC,IAAI,sDAAsD;MAC/E,CAAC,MAAM;QACLrC,oBAAW,CAACC,MAAM,CAACoC,IAAI,oFAEtB;MACH;IACF;EAAC;IAAA;IAAA,OAED,oBAAkBC,YAA0B,EAAiC;MAAA;MAAA,IAA/B5D,MAAM,uEAAG,IAAI;MACzD;MACA,IAAM6D,KAAK,aAAM,IAAI,CAAChE,OAAO,EAAE,CAAE;MAEjC,IAAI,CAACC,cAAc,CAAC+D,KAAK,CAAC,GAAGD,YAAY;MAEzCA,YAAY,CAAC5C,YAAY,CAACT,OAAO,CAAC,UAACW,EAAE,EAAK;QACxCA,EAAE,CAAC4C,EAAE,CAACC,8BAAiB,CAACC,YAAY,EAAE,MAAI,CAACjE,oBAAoB,CAAC;QAChEmB,EAAE,CAAC4C,EAAE,CAACC,8BAAiB,CAACE,WAAW,EAAE,iBAAa;UAAA,IAAX3E,KAAK,SAALA,KAAK;UAC1CsE,YAAY,CAAC/C,cAAc,GAAGvB,KAAK;UACnC,MAAI,CAACY,6BAA6B,EAAE;QACtC,CAAC,CAAC;MACJ,CAAC,CAAC;MAEF,IAAIF,MAAM,EAAE;QACV,IAAI,CAACA,MAAM,EAAE;MACf;MAEA,OAAO6D,KAAK;IACd;EAAC;IAAA;IAAA,OAED,uBAAqBK,SAAyB,EAAiB;MAAA;QAAA;MAAA,IAAflE,MAAM,uEAAG,IAAI;MAC3D,6BAAI,CAACF,cAAc,CAACoE,SAAS,CAAC,0DAA9B,sBAAgClD,YAAY,CAACT,OAAO,CAAC,UAACW,EAAE,EAAK;QAC3DA,EAAE,CAACiD,GAAG,CAACJ,8BAAiB,CAACC,YAAY,EAAE,MAAI,CAACjE,oBAAoB,CAAC;MACnE,CAAC,CAAC;MAEF,OAAO,IAAI,CAACD,cAAc,CAACoE,SAAS,CAAC;MAErC,IAAIlE,MAAM,EAAE;QACV,IAAI,CAACA,MAAM,EAAE;MACf;IACF;EAAC;IAAA;IAAA,OAED,kBAAgB;MACd,OAAO,IAAI,CAACG,YAAY,EAAE;IAC5B;EAAC;IAAA;IAAA,OAED,iBAAe;MACb,IAAI,CAACL,cAAc,GAAG,CAAC,CAAC;IAC1B;EAAC;EAAA;AAAA;AAAA"}
+{"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","mediaRequestA","mediaRequestB","_toJmpScrRequest","newRequests","previousWCMEMediaRequests","every","req","idx","isEqual","mediaRequest","RecommendedOpusBitrates","FB_MONO_MUSIC","getRecommendedMaxBitrateForFrameSize","wcmeMediaRequests","getDegradedClientRequests","push","WcmeMediaRequest","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  MediaRequest as WcmeMediaRequest,\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 = (mediaRequests: WcmeMediaRequest[]) => 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 previousWCMEMediaRequests: Array<WcmeMediaRequest> = [];\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 media requests are the same, false otherwise.\n   *\n   * @param {WcmeMediaRequest} mediaRequestA - Media request A for comparison.\n   * @param {WcmeMediaRequest} mediaRequestB - Media request B for comparison.\n   * @returns {boolean} - Whether they are equal.\n   */\n  // eslint-disable-next-line class-methods-use-this\n  public isEqual(mediaRequestA: WcmeMediaRequest, mediaRequestB: WcmeMediaRequest) {\n    return (\n      JSON.stringify(mediaRequestA._toJmpScrRequest()) ===\n      JSON.stringify(mediaRequestB._toJmpScrRequest())\n    );\n  }\n\n  /**\n   * Compares new media requests to previous ones and determines\n   * if they are the same.\n   *\n   * @param {WcmeMediaRequest[]} newRequests - Array with new requests.\n   * @returns {boolean} - True if they are equal, false otherwise.\n   */\n  private checkIsNewRequestsEqualToPrev(newRequests: WcmeMediaRequest[]) {\n    return (\n      !isEmpty(this.previousWCMEMediaRequests) &&\n      this.previousWCMEMediaRequests.length === newRequests.length &&\n      this.previousWCMEMediaRequests.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 media requests.\n   *\n   * @returns {void}\n   */\n  public clearPreviousRequests(): void {\n    this.previousWCMEMediaRequests = [];\n  }\n\n  private sendRequests() {\n    const wcmeMediaRequests: WcmeMediaRequest[] = [];\n\n    const clientRequests = this.getDegradedClientRequests();\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          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(wcmeMediaRequests)) {\n      this.sendMediaRequestsCallback(wcmeMediaRequests);\n      this.previousWCMEMediaRequests = wcmeMediaRequests;\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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"}

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

@@ -32,15 +32,21 @@ type DegradationPreferences = {
     maxMacroblocksLimit: number;
 };
 type SendMediaRequestsCallback = (mediaRequests: WcmeMediaRequest[]) => void;
+type Kind = 'audio' | 'video';
+type Options = {
+    degradationPreferences: DegradationPreferences;
+    kind: Kind;
+};
 export declare class MediaRequestManager {
     private sendMediaRequestsCallback;
+    private kind;
     private counter;
     private clientRequests;
     private degradationPreferences;
     private sourceUpdateListener;
     private debouncedSourceUpdateListener;
     private previousWCMEMediaRequests;
-    constructor(degradationPreferences: DegradationPreferences, sendMediaRequestsCallback: SendMediaRequestsCallback);
+    constructor(sendMediaRequestsCallback: SendMediaRequestsCallback, options: Options);
     setDegradationPreferences(degradationPreferences: DegradationPreferences): void;
     private getDegradedClientRequests;
     /**
@@ -59,6 +65,27 @@ export declare class MediaRequestManager {
      * @returns {boolean} - True if they are equal, false otherwise.
      */
     private checkIsNewRequestsEqualToPrev;
+    /**
+     * Returns the maxPayloadBitsPerSecond per Stream
+     *
+     * If MediaRequestManager kind is "audio", a constant bitrate will be returned.
+     * If MediaRequestManager kind is "video", the bitrate will be calculated based
+     * on maxFs (default h264 maxFs as fallback if maxFs is not defined)
+     *
+     * @param {MediaRequest} mediaRequest  - mediaRequest to take data from
+     * @returns {number} maxPayloadBitsPerSecond
+     */
+    private getMaxPayloadBitsPerSecond;
+    /**
+     * Returns the max Macro Blocks per second (maxMbps) per H264 Stream
+     *
+     * The maxMbps will be calculated based on maxFs and maxFps
+     * (default h264 maxFps as fallback if maxFps is not defined)
+     *
+     * @param {MediaRequest} mediaRequest  - mediaRequest to take data from
+     * @returns {number} maxMbps
+     */
+    private getH264MaxMbps;
     /**
      * Clears the previous media requests.
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/plugin-meetings",
-  "version": "3.0.0-beta.76",
+  "version": "3.0.0-beta.78",
   "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.76",
-    "@webex/test-helper-chai": "3.0.0-beta.76",
-    "@webex/test-helper-mocha": "3.0.0-beta.76",
-    "@webex/test-helper-mock-webex": "3.0.0-beta.76",
-    "@webex/test-helper-retry": "3.0.0-beta.76",
-    "@webex/test-helper-test-users": "3.0.0-beta.76",
+    "@webex/plugin-meetings": "3.0.0-beta.78",
+    "@webex/test-helper-chai": "3.0.0-beta.78",
+    "@webex/test-helper-mocha": "3.0.0-beta.78",
+    "@webex/test-helper-mock-webex": "3.0.0-beta.78",
+    "@webex/test-helper-retry": "3.0.0-beta.78",
+    "@webex/test-helper-test-users": "3.0.0-beta.78",
     "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.76",
-    "@webex/internal-media-core": "1.35.7",
-    "@webex/internal-plugin-conversation": "3.0.0-beta.76",
-    "@webex/internal-plugin-device": "3.0.0-beta.76",
-    "@webex/internal-plugin-llm": "3.0.0-beta.76",
-    "@webex/internal-plugin-mercury": "3.0.0-beta.76",
-    "@webex/internal-plugin-metrics": "3.0.0-beta.76",
-    "@webex/internal-plugin-support": "3.0.0-beta.76",
-    "@webex/internal-plugin-user": "3.0.0-beta.76",
-    "@webex/plugin-people": "3.0.0-beta.76",
-    "@webex/plugin-rooms": "3.0.0-beta.76",
-    "@webex/webex-core": "3.0.0-beta.76",
+    "@webex/common": "3.0.0-beta.78",
+    "@webex/internal-media-core": "1.36.0",
+    "@webex/internal-plugin-conversation": "3.0.0-beta.78",
+    "@webex/internal-plugin-device": "3.0.0-beta.78",
+    "@webex/internal-plugin-llm": "3.0.0-beta.78",
+    "@webex/internal-plugin-mercury": "3.0.0-beta.78",
+    "@webex/internal-plugin-metrics": "3.0.0-beta.78",
+    "@webex/internal-plugin-support": "3.0.0-beta.78",
+    "@webex/internal-plugin-user": "3.0.0-beta.78",
+    "@webex/plugin-people": "3.0.0-beta.78",
+    "@webex/plugin-rooms": "3.0.0-beta.78",
+    "@webex/webex-core": "3.0.0-beta.78",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",

package/src/locus-info/selfUtils.ts

@@ -294,6 +294,7 @@ SelfUtils.getStatus = (status) => ({
 SelfUtils.wasMediaInactiveOrReleased = (oldSelf: any = {}, changedSelf: any) =>
   oldSelf.joinedWith &&
   oldSelf.joinedWith.state === _JOINED_ &&
+  changedSelf.joinedWith &&
   changedSelf.joinedWith.state === _LEFT_ &&
   (changedSelf.joinedWith.reason === MEETING_END_REASON.INACTIVE ||
     changedSelf.joinedWith.reason === MEETING_END_REASON.MEDIA_RELEASED);

package/src/meeting/index.ts

@@ -632,31 +632,47 @@ export default class Meeting extends StatelessWebexPlugin {
      * All multistream media requests sent out for this meeting have to go through them.
      */
     this.mediaRequestManagers = {
-      // @ts-ignore - config coming from registerPlugin
-      audio: new MediaRequestManager(this.config.degradationPreferences, (mediaRequests) => {
-        if (!this.mediaProperties.webrtcMediaConnection) {
-          LoggerProxy.logger.warn(
-            'Meeting:index#mediaRequestManager --> trying to send audio media request before media connection was created'
-          );
+      audio: new MediaRequestManager(
+        (mediaRequests) => {
+          if (!this.mediaProperties.webrtcMediaConnection) {
+            LoggerProxy.logger.warn(
+              'Meeting:index#mediaRequestManager --> trying to send audio media request before media connection was created'
+            );
 
-          return;
-        }
-        this.mediaProperties.webrtcMediaConnection.requestMedia(MediaType.AudioMain, mediaRequests);
-      }),
-      // @ts-ignore - config coming from registerPlugin
-      video: new MediaRequestManager(this.config.degradationPreferences, (mediaRequests) => {
-        if (!this.mediaProperties.webrtcMediaConnection) {
-          LoggerProxy.logger.warn(
-            'Meeting:index#mediaRequestManager --> trying to send video media request before media connection was created'
+            return;
+          }
+          this.mediaProperties.webrtcMediaConnection.requestMedia(
+            MediaType.AudioMain,
+            mediaRequests
           );
+        },
+        {
+          // @ts-ignore - config coming from registerPlugin
+          degradationPreferences: this.config.degradationPreferences,
+          kind: 'audio',
+        }
+      ),
+      video: new MediaRequestManager(
+        (mediaRequests) => {
+          if (!this.mediaProperties.webrtcMediaConnection) {
+            LoggerProxy.logger.warn(
+              'Meeting:index#mediaRequestManager --> trying to send video media request before media connection was created'
+            );
 
-          return;
+            return;
+          }
+          this.mediaProperties.webrtcMediaConnection.requestMedia(
+            MediaType.VideoMain,
+            mediaRequests
+          );
+        },
+        {
+          // @ts-ignore - config coming from registerPlugin
+          degradationPreferences: this.config.degradationPreferences,
+          kind: 'video',
         }
-        this.mediaProperties.webrtcMediaConnection.requestMedia(MediaType.VideoMain, mediaRequests);
-      }),
+      ),
       screenShareAudio: new MediaRequestManager(
-        // @ts-ignore - config coming from registerPlugin
-        this.config.degradationPreferences,
         (mediaRequests) => {
           if (!this.mediaProperties.webrtcMediaConnection) {
             LoggerProxy.logger.warn(
@@ -669,11 +685,14 @@ export default class Meeting extends StatelessWebexPlugin {
             MediaType.AudioSlides,
             mediaRequests
           );
+        },
+        {
+          // @ts-ignore - config coming from registerPlugin
+          degradationPreferences: this.config.degradationPreferences,
+          kind: 'audio',
         }
       ),
       screenShareVideo: new MediaRequestManager(
-        // @ts-ignore - config coming from registerPlugin
-        this.config.degradationPreferences,
         (mediaRequests) => {
           if (!this.mediaProperties.webrtcMediaConnection) {
             LoggerProxy.logger.warn(
@@ -686,6 +705,11 @@ export default class Meeting extends StatelessWebexPlugin {
             MediaType.VideoSlides,
             mediaRequests
           );
+        },
+        {
+          // @ts-ignore - config coming from registerPlugin
+          degradationPreferences: this.config.degradationPreferences,
+          kind: 'video',
         }
       ),
     };

package/src/multistream/mediaRequestManager.ts

@@ -6,6 +6,8 @@ import {
   ReceiverSelectedInfo,
   CodecInfo as WcmeCodecInfo,
   H264Codec,
+  getRecommendedMaxBitrateForFrameSize,
+  RecommendedOpusBitrates,
 } from '@webex/internal-media-core';
 import {cloneDeep, debounce, isEmpty} from 'lodash';
 
@@ -64,10 +66,17 @@ type DegradationPreferences = {
 };
 
 type SendMediaRequestsCallback = (mediaRequests: WcmeMediaRequest[]) => void;
+type Kind = 'audio' | 'video';
 
+type Options = {
+  degradationPreferences: DegradationPreferences;
+  kind: Kind;
+};
 export class MediaRequestManager {
   private sendMediaRequestsCallback: SendMediaRequestsCallback;
 
+  private kind: Kind;
+
   private counter: number;
 
   private clientRequests: {[key: MediaRequestId]: MediaRequest};
@@ -80,14 +89,12 @@ export class MediaRequestManager {
 
   private previousWCMEMediaRequests: Array<WcmeMediaRequest> = [];
 
-  constructor(
-    degradationPreferences: DegradationPreferences,
-    sendMediaRequestsCallback: SendMediaRequestsCallback
-  ) {
+  constructor(sendMediaRequestsCallback: SendMediaRequestsCallback, options: Options) {
     this.sendMediaRequestsCallback = sendMediaRequestsCallback;
     this.counter = 0;
     this.clientRequests = {};
-    this.degradationPreferences = degradationPreferences;
+    this.degradationPreferences = options.degradationPreferences;
+    this.kind = options.kind;
     this.sourceUpdateListener = this.commit.bind(this);
     this.debouncedSourceUpdateListener = debounce(
       this.sourceUpdateListener,
@@ -175,6 +182,45 @@ export class MediaRequestManager {
     );
   }
 
+  /**
+   * Returns the maxPayloadBitsPerSecond per Stream
+   *
+   * If MediaRequestManager kind is "audio", a constant bitrate will be returned.
+   * If MediaRequestManager kind is "video", the bitrate will be calculated based
+   * on maxFs (default h264 maxFs as fallback if maxFs is not defined)
+   *
+   * @param {MediaRequest} mediaRequest  - mediaRequest to take data from
+   * @returns {number} maxPayloadBitsPerSecond
+   */
+  private getMaxPayloadBitsPerSecond(mediaRequest: MediaRequest): number {
+    if (this.kind === 'audio') {
+      // return mono_music bitrate default if the kind of mediarequest manager is audio:
+      return RecommendedOpusBitrates.FB_MONO_MUSIC;
+    }
+
+    return getRecommendedMaxBitrateForFrameSize(
+      mediaRequest.codecInfo.maxFs || CODEC_DEFAULTS.h264.maxFs
+    );
+  }
+
+  /**
+   * Returns the max Macro Blocks per second (maxMbps) per H264 Stream
+   *
+   * The maxMbps will be calculated based on maxFs and maxFps
+   * (default h264 maxFps as fallback if maxFps is not defined)
+   *
+   * @param {MediaRequest} mediaRequest  - mediaRequest to take data from
+   * @returns {number} maxMbps
+   */
+  // eslint-disable-next-line class-methods-use-this
+  private getH264MaxMbps(mediaRequest: MediaRequest): number {
+    // fallback for maxFps (not needed for maxFs, since there is a fallback already in getDegradedClientRequests)
+    const maxFps = mediaRequest.codecInfo.maxFps || CODEC_DEFAULTS.h264.maxFps;
+
+    // divided by 100 since maxFps is 3000 (for 30 frames per seconds)
+    return (mediaRequest.codecInfo.maxFs * maxFps) / 100;
+  }
+
   /**
    * Clears the previous media requests.
    *
@@ -188,7 +234,6 @@ export class MediaRequestManager {
     const wcmeMediaRequests: WcmeMediaRequest[] = [];
 
     const clientRequests = this.getDegradedClientRequests();
-    const maxPayloadBitsPerSecond = 10 * 1000 * 1000;
 
     // map all the client media requests to wcme media requests
     Object.values(clientRequests).forEach((mr) => {
@@ -206,14 +251,14 @@ export class MediaRequestManager {
               )
             : new ReceiverSelectedInfo(mr.policyInfo.csi),
           mr.receiveSlots.map((receiveSlot) => receiveSlot.wcmeReceiveSlot),
-          maxPayloadBitsPerSecond,
+          this.getMaxPayloadBitsPerSecond(mr),
           mr.codecInfo && [
             new WcmeCodecInfo(
               0x80,
               new H264Codec(
                 mr.codecInfo.maxFs,
                 mr.codecInfo.maxFps || CODEC_DEFAULTS.h264.maxFps,
-                mr.codecInfo.maxMbps || CODEC_DEFAULTS.h264.maxMbps,
+                this.getH264MaxMbps(mr),
                 mr.codecInfo.maxWidth,
                 mr.codecInfo.maxHeight
               )

package/test/unit/spec/meeting/utils.js

@@ -4,7 +4,7 @@ import MeetingUtil from '@webex/plugin-meetings/src/meeting/util';
 import LoggerProxy from '@webex/plugin-meetings/src/common/logs/logger-proxy';
 import LoggerConfig from '@webex/plugin-meetings/src/common/logs/logger-config';
 import Metrics from '@webex/plugin-meetings/src/metrics/index';
-import {DISPLAY_HINTS} from '@webex/plugin-meetings/dist/constants';
+import {DISPLAY_HINTS} from '@webex/plugin-meetings/src/constants';
 
 describe('plugin-meetings', () => {
   describe('Meeting utils function', () => {