@webex/plugin-meetings 3.0.0-beta.34 → 3.0.0-beta.340

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

@@ -3,23 +3,28 @@ import {ReceiveSlot} from '@webex/plugin-meetings/src/multistream/receiveSlot';
 import sinon from 'sinon';
 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 { expect } from 'chai';
 
 type ExpectedActiveSpeaker = {
   policy: 'active-speaker';
+  maxPayloadBitsPerSecond?: number;
   priority: number;
   receiveSlots: Array<ReceiveSlot>;
-  maxFs: number;
+  maxFs?: number;
+  maxMbps?: number;
 };
 type ExpectedReceiverSelected = {
   policy: 'receiver-selected';
+  maxPayloadBitsPerSecond?: number;
   csi: number;
   receiveSlot: ReceiveSlot;
-  maxFs: number;
+  maxFs?: number;
+  maxMbps?: number;
 };
 type ExpectedRequest = ExpectedActiveSpeaker | ExpectedReceiverSelected;
 
-const maxPayloadBitsPerSecond = 10 * 1000 * 1000; // for now we always send this fixed constant
-
 const degradationPreferences = {
   maxMacroblocksLimit: Infinity, // no limit
 };
@@ -27,11 +32,18 @@ const degradationPreferences = {
 describe('MediaRequestManager', () => {
   const CROSS_PRIORITY_DUPLICATION = true;
   const CROSS_POLICY_DUPLICATION = true;
-  const PREFER_LIVE_VIDEO = true;
-  const ACTIVE_SPEAKER_MAX_FS = 3600;
-  const RECEIVER_SELECTED_MAX_FS = 8190;
-
-  const NUM_SLOTS = 10;
+  const MAX_FPS = 3000;
+  const MAX_FS_360p = 920;
+  const MAX_FS_720p = 3600;
+  const MAX_FS_1080p = 8192;
+  const MAX_MBPS_360p = 27600;
+  const MAX_MBPS_720p = 108000;
+  const MAX_MBPS_1080p = 245760;
+  const MAX_PAYLOADBITSPS_360p = 640000;
+  const MAX_PAYLOADBITSPS_720p = 2500000;
+  const MAX_PAYLOADBITSPS_1080p = 4000000;
+
+  const NUM_SLOTS = 15;
 
   let mediaRequestManager: MediaRequestManager;
   let sendMediaRequestsCallback;
@@ -40,10 +52,11 @@ describe('MediaRequestManager', () => {
 
   beforeEach(() => {
     sendMediaRequestsCallback = sinon.stub();
-    mediaRequestManager = new MediaRequestManager(
+    mediaRequestManager = new MediaRequestManager(sendMediaRequestsCallback, {
       degradationPreferences,
-      sendMediaRequestsCallback
-    );
+      kind: 'video',
+      trimRequestsToNumOfSources: false,
+    });
 
     // create some fake receive slots used by the tests
     fakeWcmeSlots = Array(NUM_SLOTS)
@@ -62,13 +75,12 @@ describe('MediaRequestManager', () => {
             off: sinon.stub(),
             sourceState: 'live',
             wcmeReceiveSlot: fakeWcmeSlots[index],
-            resetSourceState: sinon.stub(),
           } as unknown as ReceiveSlot)
       );
   });
 
   // helper function for adding an active speaker request
-  const addActiveSpeakerRequest = (priority, receiveSlots, maxFs, commit = false) =>
+  const addActiveSpeakerRequest = (priority, receiveSlots, maxFs, commit = false, preferLiveVideo = true) =>
     mediaRequestManager.addRequest(
       {
         policyInfo: {
@@ -76,7 +88,7 @@ describe('MediaRequestManager', () => {
           priority,
           crossPriorityDuplication: CROSS_PRIORITY_DUPLICATION,
           crossPolicyDuplication: CROSS_POLICY_DUPLICATION,
-          preferLiveVideo: PREFER_LIVE_VIDEO,
+          preferLiveVideo,
         },
         receiveSlots,
         codecInfo: {
@@ -109,7 +121,12 @@ describe('MediaRequestManager', () => {
   // It should be used only for verifying requests created with
   // addActiveSpeakerRequest() or addReceiverSelectedRequest(), because of some
   // hardcoded values used in them
-  const checkMediaRequestsSent = (expectedRequests: ExpectedRequest[]) => {
+  const checkMediaRequestsSent = (
+    expectedRequests: ExpectedRequest[], {
+      isCodecInfoDefined = true,
+      preferLiveVideo = true,
+    } = {}
+  ) => {
     assert.calledOnce(sendMediaRequestsCallback);
     assert.calledWith(
       sendMediaRequestsCallback,
@@ -121,18 +138,21 @@ describe('MediaRequestManager', () => {
               priority: expectedRequest.priority,
               crossPriorityDuplication: CROSS_PRIORITY_DUPLICATION,
               crossPolicyDuplication: CROSS_POLICY_DUPLICATION,
-              preferLiveVideo: PREFER_LIVE_VIDEO,
+              preferLiveVideo,
             }),
             receiveSlots: expectedRequest.receiveSlots,
-            maxPayloadBitsPerSecond,
-            codecInfos: [
-              sinon.match({
-                payloadType: 0x80,
-                h264: sinon.match({
-                  maxFs: expectedRequest.maxFs,
-                }),
-              }),
-            ],
+            maxPayloadBitsPerSecond: expectedRequest.maxPayloadBitsPerSecond,
+            codecInfos: isCodecInfoDefined
+              ? [
+                  sinon.match({
+                    payloadType: 0x80,
+                    h264: sinon.match({
+                      maxMbps: expectedRequest.maxMbps,
+                      maxFs: expectedRequest.maxFs,
+                    }),
+                  }),
+                ]
+              : [],
           });
         }
         if (expectedRequest.policy === 'receiver-selected') {
@@ -142,15 +162,18 @@ describe('MediaRequestManager', () => {
               csi: expectedRequest.csi,
             }),
             receiveSlots: [expectedRequest.receiveSlot],
-            maxPayloadBitsPerSecond,
-            codecInfos: [
-              sinon.match({
-                payloadType: 0x80,
-                h264: sinon.match({
-                  maxFs: expectedRequest.maxFs,
-                }),
-              }),
-            ],
+            maxPayloadBitsPerSecond: expectedRequest.maxPayloadBitsPerSecond,
+            codecInfos: isCodecInfoDefined
+              ? [
+                  sinon.match({
+                    payloadType: 0x80,
+                    h264: sinon.match({
+                      maxMbps: expectedRequest.maxMbps,
+                      maxFs: expectedRequest.maxFs,
+                    }),
+                  }),
+                ]
+              : [],
           });
         }
 
@@ -184,8 +207,8 @@ describe('MediaRequestManager', () => {
         receiveSlots: [fakeReceiveSlots[0], fakeReceiveSlots[1], fakeReceiveSlots[2]],
         codecInfo: {
           codec: 'h264',
-          maxFs: 1620,
-          maxFps: 1500,
+          maxFs: MAX_FS_360p,
+          maxFps: MAX_FPS,
         },
       },
       false
@@ -199,9 +222,9 @@ describe('MediaRequestManager', () => {
         receiveSlots: [fakeReceiveSlots[3]],
         codecInfo: {
           codec: 'h264',
-          maxFs: 3600,
-          maxFps: 2500,
-          maxMbps: 90000,
+          maxFs: MAX_FS_720p,
+          maxFps: MAX_FPS,
+          maxMbps: MAX_MBPS_720p,
         },
       },
       false
@@ -217,9 +240,9 @@ describe('MediaRequestManager', () => {
         receiveSlots: [fakeReceiveSlots[4]],
         codecInfo: {
           codec: 'h264',
-          maxFs: 8192,
-          maxFps: 2500,
-          maxMbps: 204800,
+          maxFs: MAX_FS_1080p,
+          maxFps: MAX_FPS,
+          maxMbps: MAX_MBPS_1080p,
         },
       },
       true
@@ -237,13 +260,14 @@ describe('MediaRequestManager', () => {
           preferLiveVideo: false,
         }),
         receiveSlots: [fakeWcmeSlots[0], fakeWcmeSlots[1], fakeWcmeSlots[2]],
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_360p,
         codecInfos: [
           sinon.match({
             payloadType: 0x80,
             h264: sinon.match({
-              maxFs: 1620,
-              maxFps: 1500,
-              maxMbps: 245760,
+              maxFs: MAX_FS_360p,
+              maxFps: MAX_FPS,
+              maxMbps: MAX_MBPS_360p,
             }),
           }),
         ],
@@ -254,13 +278,14 @@ describe('MediaRequestManager', () => {
           csi: 123,
         }),
         receiveSlots: [fakeWcmeSlots[3]],
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_720p,
         codecInfos: [
           sinon.match({
             payloadType: 0x80,
             h264: sinon.match({
-              maxFs: 3600,
-              maxFps: 2500,
-              maxMbps: 90000,
+              maxFs: MAX_FS_720p,
+              maxFps: MAX_FPS,
+              maxMbps: MAX_MBPS_720p,
             }),
           }),
         ],
@@ -271,13 +296,14 @@ describe('MediaRequestManager', () => {
           csi: 123,
         }),
         receiveSlots: [fakeWcmeSlots[4]],
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
         codecInfos: [
           sinon.match({
             payloadType: 0x80,
             h264: sinon.match({
-              maxFs: 8192,
-              maxFps: 2500,
-              maxMbps: 204800,
+              maxFs: MAX_FS_1080p,
+              maxFps: MAX_FPS,
+              maxMbps: MAX_MBPS_1080p,
             }),
           }),
         ],
@@ -287,32 +313,38 @@ describe('MediaRequestManager', () => {
 
   it('keeps adding requests with every call to addRequest()', () => {
     // start with 1 request
-    addReceiverSelectedRequest(100, fakeReceiveSlots[0], RECEIVER_SELECTED_MAX_FS, true);
+    addReceiverSelectedRequest(100, fakeReceiveSlots[0], MAX_FS_1080p, true);
 
     checkMediaRequestsSent([
       {
         policy: 'receiver-selected',
         csi: 100,
         receiveSlot: fakeWcmeSlots[0],
-        maxFs: RECEIVER_SELECTED_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
+        maxFs: MAX_FS_1080p,
+        maxMbps: MAX_MBPS_1080p,
       },
     ]);
 
     // now add another one
-    addReceiverSelectedRequest(101, fakeReceiveSlots[1], RECEIVER_SELECTED_MAX_FS, true);
+    addReceiverSelectedRequest(101, fakeReceiveSlots[1], MAX_FS_1080p, true);
 
     checkMediaRequestsSent([
       {
         policy: 'receiver-selected',
         csi: 100,
         receiveSlot: fakeWcmeSlots[0],
-        maxFs: RECEIVER_SELECTED_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
+        maxFs: MAX_FS_1080p,
+        maxMbps: MAX_MBPS_1080p,
       },
       {
         policy: 'receiver-selected',
         csi: 101,
         receiveSlot: fakeWcmeSlots[1],
-        maxFs: RECEIVER_SELECTED_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
+        maxFs: MAX_FS_1080p,
+        maxMbps: MAX_MBPS_1080p,
       },
     ]);
 
@@ -320,7 +352,7 @@ describe('MediaRequestManager', () => {
     addActiveSpeakerRequest(
       1,
       [fakeReceiveSlots[2], fakeReceiveSlots[3], fakeReceiveSlots[4]],
-      ACTIVE_SPEAKER_MAX_FS,
+      MAX_FS_720p,
       true
     );
 
@@ -329,37 +361,55 @@ describe('MediaRequestManager', () => {
         policy: 'receiver-selected',
         csi: 100,
         receiveSlot: fakeWcmeSlots[0],
-        maxFs: RECEIVER_SELECTED_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
+        maxFs: MAX_FS_1080p,
+        maxMbps: MAX_MBPS_1080p,
       },
       {
         policy: 'receiver-selected',
         csi: 101,
         receiveSlot: fakeWcmeSlots[1],
-        maxFs: RECEIVER_SELECTED_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
+        maxFs: MAX_FS_1080p,
+        maxMbps: MAX_MBPS_1080p,
       },
       {
         policy: 'active-speaker',
         priority: 1,
         receiveSlots: [fakeWcmeSlots[2], fakeWcmeSlots[3], fakeWcmeSlots[4]],
-        maxFs: ACTIVE_SPEAKER_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_720p,
+        maxFs: MAX_FS_720p,
+        maxMbps: MAX_MBPS_720p,
       },
     ]);
   });
 
+  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]],
-        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),
+      addActiveSpeakerRequest(255, [fakeReceiveSlots[0], fakeReceiveSlots[1]], MAX_FS_720p),
+      addActiveSpeakerRequest(255, [fakeReceiveSlots[2], fakeReceiveSlots[3]], MAX_FS_720p),
+      addReceiverSelectedRequest(100, fakeReceiveSlots[4], MAX_FS_1080p),
+      addReceiverSelectedRequest(200, fakeReceiveSlots[5], MAX_FS_1080p),
     ];
 
     // cancel one of the active speaker requests
@@ -371,19 +421,25 @@ describe('MediaRequestManager', () => {
         policy: 'active-speaker',
         priority: 255,
         receiveSlots: [fakeWcmeSlots[0], fakeWcmeSlots[1]],
-        maxFs: ACTIVE_SPEAKER_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_720p,
+        maxFs: MAX_FS_720p,
+        maxMbps: MAX_MBPS_720p,
       },
       {
         policy: 'receiver-selected',
         csi: 100,
         receiveSlot: fakeWcmeSlots[4],
-        maxFs: RECEIVER_SELECTED_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
+        maxFs: MAX_FS_1080p,
+        maxMbps: MAX_MBPS_1080p,
       },
       {
         policy: 'receiver-selected',
         csi: 200,
         receiveSlot: fakeWcmeSlots[5],
-        maxFs: RECEIVER_SELECTED_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
+        maxFs: MAX_FS_1080p,
+        maxMbps: MAX_MBPS_1080p,
       },
     ]);
 
@@ -396,13 +452,17 @@ describe('MediaRequestManager', () => {
         policy: 'active-speaker',
         priority: 255,
         receiveSlots: [fakeWcmeSlots[0], fakeWcmeSlots[1]],
-        maxFs: ACTIVE_SPEAKER_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_720p,
+        maxFs: MAX_FS_720p,
+        maxMbps: MAX_MBPS_720p,
       },
       {
         policy: 'receiver-selected',
         csi: 100,
         receiveSlot: fakeWcmeSlots[4],
-        maxFs: RECEIVER_SELECTED_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
+        maxFs: MAX_FS_1080p,
+        maxMbps: MAX_MBPS_1080p,
       },
     ]);
   });
@@ -411,10 +471,10 @@ describe('MediaRequestManager', () => {
     addActiveSpeakerRequest(
       10,
       [fakeReceiveSlots[0], fakeReceiveSlots[1], fakeReceiveSlots[2]],
-      ACTIVE_SPEAKER_MAX_FS,
+      MAX_FS_720p,
       false
     );
-    addReceiverSelectedRequest(123, fakeReceiveSlots[3], RECEIVER_SELECTED_MAX_FS, false);
+    addReceiverSelectedRequest(123, fakeReceiveSlots[3], MAX_FS_1080p, false);
 
     // nothing should be sent out as we didn't commit the requests
     assert.notCalled(sendMediaRequestsCallback);
@@ -428,13 +488,17 @@ describe('MediaRequestManager', () => {
         policy: 'active-speaker',
         priority: 10,
         receiveSlots: [fakeWcmeSlots[0], fakeWcmeSlots[1], fakeWcmeSlots[2]],
-        maxFs: ACTIVE_SPEAKER_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_720p,
+        maxFs: MAX_FS_720p,
+        maxMbps: MAX_MBPS_720p,
       },
       {
         policy: 'receiver-selected',
         csi: 123,
         receiveSlot: fakeWcmeSlots[3],
-        maxFs: RECEIVER_SELECTED_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
+        maxFs: MAX_FS_1080p,
+        maxMbps: MAX_MBPS_1080p,
       },
     ]);
   });
@@ -445,12 +509,12 @@ describe('MediaRequestManager', () => {
       addActiveSpeakerRequest(
         250,
         [fakeReceiveSlots[0], fakeReceiveSlots[1], fakeReceiveSlots[2]],
-        ACTIVE_SPEAKER_MAX_FS,
+        MAX_FS_720p,
         false
       ),
-      addReceiverSelectedRequest(98765, fakeReceiveSlots[3], RECEIVER_SELECTED_MAX_FS, false),
-      addReceiverSelectedRequest(99999, fakeReceiveSlots[4], RECEIVER_SELECTED_MAX_FS, false),
-      addReceiverSelectedRequest(88888, fakeReceiveSlots[5], RECEIVER_SELECTED_MAX_FS, true),
+      addReceiverSelectedRequest(98765, fakeReceiveSlots[3], MAX_FS_1080p, false),
+      addReceiverSelectedRequest(99999, fakeReceiveSlots[4], MAX_FS_1080p, false),
+      addReceiverSelectedRequest(88888, fakeReceiveSlots[5], MAX_FS_1080p, true),
     ];
 
     checkMediaRequestsSent([
@@ -458,25 +522,33 @@ describe('MediaRequestManager', () => {
         policy: 'active-speaker',
         priority: 250,
         receiveSlots: [fakeWcmeSlots[0], fakeWcmeSlots[1], fakeWcmeSlots[2]],
-        maxFs: ACTIVE_SPEAKER_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_720p,
+        maxFs: MAX_FS_720p,
+        maxMbps: MAX_MBPS_720p,
       },
       {
         policy: 'receiver-selected',
         csi: 98765,
         receiveSlot: fakeWcmeSlots[3],
-        maxFs: RECEIVER_SELECTED_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
+        maxFs: MAX_FS_1080p,
+        maxMbps: MAX_MBPS_1080p,
       },
       {
         policy: 'receiver-selected',
         csi: 99999,
         receiveSlot: fakeWcmeSlots[4],
-        maxFs: RECEIVER_SELECTED_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
+        maxFs: MAX_FS_1080p,
+        maxMbps: MAX_MBPS_1080p,
       },
       {
         policy: 'receiver-selected',
         csi: 88888,
         receiveSlot: fakeWcmeSlots[5],
-        maxFs: RECEIVER_SELECTED_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
+        maxFs: MAX_FS_1080p,
+        maxMbps: MAX_MBPS_1080p,
       },
     ]);
 
@@ -495,25 +567,27 @@ describe('MediaRequestManager', () => {
         policy: 'receiver-selected',
         csi: 98765,
         receiveSlot: fakeWcmeSlots[3],
-        maxFs: RECEIVER_SELECTED_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
+        maxFs: MAX_FS_1080p,
+        maxMbps: MAX_MBPS_1080p,
       },
     ]);
   });
 
   it('sends the wcme media requests when commit() is called', () => {
     // send some requests, all of them with commit=false
-    addReceiverSelectedRequest(123000, fakeReceiveSlots[0], RECEIVER_SELECTED_MAX_FS, false);
-    addReceiverSelectedRequest(456000, fakeReceiveSlots[1], RECEIVER_SELECTED_MAX_FS, false);
+    addReceiverSelectedRequest(123000, fakeReceiveSlots[0], MAX_FS_1080p, false);
+    addReceiverSelectedRequest(456000, fakeReceiveSlots[1], MAX_FS_1080p, false);
     addActiveSpeakerRequest(
       255,
       [fakeReceiveSlots[2], fakeReceiveSlots[3], fakeReceiveSlots[4]],
-      ACTIVE_SPEAKER_MAX_FS,
+      MAX_FS_720p,
       false
     );
     addActiveSpeakerRequest(
       254,
       [fakeReceiveSlots[5], fakeReceiveSlots[6], fakeReceiveSlots[7]],
-      ACTIVE_SPEAKER_MAX_FS,
+      MAX_FS_720p,
       false
     );
 
@@ -529,78 +603,99 @@ describe('MediaRequestManager', () => {
         policy: 'receiver-selected',
         csi: 123000,
         receiveSlot: fakeWcmeSlots[0],
-        maxFs: RECEIVER_SELECTED_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
+        maxFs: MAX_FS_1080p,
+        maxMbps: MAX_MBPS_1080p,
       },
       {
         policy: 'receiver-selected',
         csi: 456000,
         receiveSlot: fakeWcmeSlots[1],
-        maxFs: RECEIVER_SELECTED_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
+        maxFs: MAX_FS_1080p,
+        maxMbps: MAX_MBPS_1080p,
       },
       {
         policy: 'active-speaker',
         priority: 255,
         receiveSlots: [fakeWcmeSlots[2], fakeWcmeSlots[3], fakeWcmeSlots[4]],
-        maxFs: ACTIVE_SPEAKER_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_720p,
+        maxFs: MAX_FS_720p,
+        maxMbps: MAX_MBPS_720p,
       },
       {
         policy: 'active-speaker',
         priority: 254,
         receiveSlots: [fakeWcmeSlots[5], fakeWcmeSlots[6], fakeWcmeSlots[7]],
-        maxFs: ACTIVE_SPEAKER_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_720p,
+        maxFs: MAX_FS_720p,
+        maxMbps: MAX_MBPS_720p,
       },
     ]);
   });
 
-  it('clears all the requests on reset()', () => {
+  it('avoids sending duplicate requests and clears all the requests on reset()', () => {
     // send some requests and commit them one by one
-    addReceiverSelectedRequest(1500, fakeReceiveSlots[0], RECEIVER_SELECTED_MAX_FS, true);
-    addReceiverSelectedRequest(1501, fakeReceiveSlots[1], RECEIVER_SELECTED_MAX_FS, true);
+    addReceiverSelectedRequest(1500, fakeReceiveSlots[0], MAX_FS_1080p, false);
+    addReceiverSelectedRequest(1501, fakeReceiveSlots[1], MAX_FS_1080p, false);
     addActiveSpeakerRequest(
       255,
       [fakeReceiveSlots[2], fakeReceiveSlots[3], fakeReceiveSlots[4]],
-      ACTIVE_SPEAKER_MAX_FS,
-      true
+      MAX_FS_720p,
+      false
     );
     addActiveSpeakerRequest(
       254,
       [fakeReceiveSlots[5], fakeReceiveSlots[6], fakeReceiveSlots[7]],
-      ACTIVE_SPEAKER_MAX_FS,
-      true
+      MAX_FS_720p,
+      false
     );
 
-    sendMediaRequestsCallback.resetHistory();
+    // nothing should be sent out as we didn't commit the requests
+    assert.notCalled(sendMediaRequestsCallback);
 
-    // check that when calling commit() all requests are re-sent again
     mediaRequestManager.commit();
-
     checkMediaRequestsSent([
       {
         policy: 'receiver-selected',
         csi: 1500,
         receiveSlot: fakeWcmeSlots[0],
-        maxFs: RECEIVER_SELECTED_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
+        maxFs: MAX_FS_1080p,
+        maxMbps: MAX_MBPS_1080p,
       },
       {
         policy: 'receiver-selected',
         csi: 1501,
         receiveSlot: fakeWcmeSlots[1],
-        maxFs: RECEIVER_SELECTED_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
+        maxFs: MAX_FS_1080p,
+        maxMbps: MAX_MBPS_1080p,
       },
       {
         policy: 'active-speaker',
         priority: 255,
         receiveSlots: [fakeWcmeSlots[2], fakeWcmeSlots[3], fakeWcmeSlots[4]],
-        maxFs: ACTIVE_SPEAKER_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_720p,
+        maxFs: MAX_FS_720p,
+        maxMbps: MAX_MBPS_720p,
       },
       {
         policy: 'active-speaker',
         priority: 254,
         receiveSlots: [fakeWcmeSlots[5], fakeWcmeSlots[6], fakeWcmeSlots[7]],
-        maxFs: ACTIVE_SPEAKER_MAX_FS,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_720p,
+        maxFs: MAX_FS_720p,
+        maxMbps: MAX_MBPS_720p,
       },
     ]);
 
+    // check that when calling commit()
+    // all requests are not re-sent again (avoid duplicate requests)
+    mediaRequestManager.commit();
+
+    assert.notCalled(sendMediaRequestsCallback);
+
     // now reset everything
     mediaRequestManager.reset();
 
@@ -609,76 +704,81 @@ 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),
-    ];
+  it('makes sure to call requests correctly after reset was called and another request was added', () => {
+    addReceiverSelectedRequest(1500, fakeReceiveSlots[0], MAX_FS_1080p, false);
+
+    assert.notCalled(sendMediaRequestsCallback);
 
     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: 1500,
+        receiveSlot: fakeWcmeSlots[0],
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
+        maxFs: MAX_FS_1080p,
+        maxMbps: MAX_MBPS_1080p,
       },
+    ]);
+
+    // now reset everything
+    mediaRequestManager.reset();
+
+    // calling commit now should not cause any requests to be sent out
+    mediaRequestManager.commit();
+    checkMediaRequestsSent([]);
+
+    //add new request
+    addReceiverSelectedRequest(1501, fakeReceiveSlots[1], MAX_FS_1080p, false);
+
+    // commit
+    mediaRequestManager.commit();
+
+    // check the new request was sent
+    checkMediaRequestsSent([
       {
         policy: 'receiver-selected',
-        csi: 100,
-        receiveSlot: fakeWcmeSlots[4],
-        maxFs: RECEIVER_SELECTED_MAX_FS,
+        csi: 1501,
+        receiveSlot: fakeWcmeSlots[1],
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
+        maxFs: MAX_FS_1080p,
+        maxMbps: MAX_MBPS_1080p,
       },
+    ]);
+  });
+
+  it('can send same media request after previous requests have been cleared', () => {
+    // add a request and commit
+    addReceiverSelectedRequest(1500, fakeReceiveSlots[0], MAX_FS_1080p, false);
+    mediaRequestManager.commit();
+    checkMediaRequestsSent([
       {
         policy: 'receiver-selected',
-        csi: 200,
-        receiveSlot: fakeWcmeSlots[5],
-        maxFs: RECEIVER_SELECTED_MAX_FS,
+        csi: 1500,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
+        receiveSlot: fakeWcmeSlots[0],
+        maxFs: MAX_FS_1080p,
+        maxMbps: MAX_MBPS_1080p,
       },
     ]);
 
-    // cancel 2 of the requests
-    mediaRequestManager.cancelRequest(requestIds[1], false);
-    mediaRequestManager.cancelRequest(requestIds[3], false);
+    // clear previous requests
+    mediaRequestManager.clearPreviousRequests();
 
+    // commit same request
     mediaRequestManager.commit();
 
-    // expect only the 2 remaining requests to be sent out
+    // check the request was sent
     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,
+        csi: 1500,
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
+        receiveSlot: fakeWcmeSlots[0],
+        maxFs: MAX_FS_1080p,
+        maxMbps: MAX_MBPS_1080p,
       },
     ]);
-
-    // 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', () => {
@@ -706,7 +806,9 @@ describe('MediaRequestManager', () => {
         policy: 'active-speaker',
         priority: 255,
         receiveSlots: fakeWcmeSlots.slice(0, 4),
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
         maxFs: getMaxFs('large'),
+        maxMbps: MAX_MBPS_1080p,
       },
     ]);
   });
@@ -733,13 +835,17 @@ describe('MediaRequestManager', () => {
         policy: 'active-speaker',
         priority: 255,
         receiveSlots: fakeWcmeSlots.slice(0, 3),
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_720p,
         maxFs: getMaxFs('medium'),
+        maxMbps: MAX_MBPS_720p,
       },
       {
         policy: 'receiver-selected',
         csi: 123,
         receiveSlot: fakeWcmeSlots[3],
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_720p,
         maxFs: getMaxFs('medium'),
+        maxMbps: MAX_MBPS_720p,
       },
     ]);
 
@@ -752,7 +858,9 @@ describe('MediaRequestManager', () => {
         policy: 'active-speaker',
         priority: 255,
         receiveSlots: fakeWcmeSlots.slice(0, 3),
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
         maxFs: getMaxFs('large'),
+        maxMbps: MAX_MBPS_1080p,
       },
     ]);
   });
@@ -771,7 +879,9 @@ describe('MediaRequestManager', () => {
         policy: 'active-speaker',
         priority: 255,
         receiveSlots: fakeWcmeSlots.slice(0, 10),
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_360p,
         maxFs: getMaxFs('small'),
+        maxMbps: MAX_MBPS_360p,
       },
     ]);
   });
@@ -791,14 +901,518 @@ describe('MediaRequestManager', () => {
         policy: 'active-speaker',
         priority: 255,
         receiveSlots: fakeWcmeSlots.slice(0, 5),
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_720p,
         maxFs: getMaxFs('medium'),
+        maxMbps: MAX_MBPS_720p,
       },
       {
         policy: 'active-speaker',
         priority: 254,
         receiveSlots: fakeWcmeSlots.slice(5, 10),
+        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_360p,
         maxFs: getMaxFs('small'),
+        maxMbps: MAX_MBPS_360p,
       },
     ]);
   });
+
+  it('respects the preferredMaxFs if set', () => {
+    sendMediaRequestsCallback.resetHistory();
+    const clock = FakeTimers.install({now: Date.now()});
+
+    addActiveSpeakerRequest(255, fakeReceiveSlots.slice(0, 10), getMaxFs('large'), true);
+
+    sendMediaRequestsCallback.resetHistory();
+
+    const maxFsHandlerCall = fakeReceiveSlots[0].on.getCall(1);
+
+    const maxFsHandler = maxFsHandlerCall.args[1];
+    const eventName = maxFsHandlerCall.args[0];
+
+    assert.equal(eventName, 'maxFsUpdate');
+
+    const preferredFrameSize = 100;
+
+    maxFsHandler({maxFs: preferredFrameSize});
+
+    clock.tick(999);
+
+    assert.notCalled(sendMediaRequestsCallback);
+
+    clock.tick(1);
+
+    checkMediaRequestsSent([
+      {
+        policy: 'active-speaker',
+        priority: 255,
+        receiveSlots: fakeWcmeSlots.slice(0, 10),
+        maxFs: preferredFrameSize,
+        maxPayloadBitsPerSecond: 99000,
+        maxMbps: 3000,
+      },
+    ]);
+  });
+
+  describe('maxPayloadBitsPerSecond', () => {
+    let getRecommendedMaxBitrateForFrameSizeSpy;
+
+    beforeEach(() => {
+      sendMediaRequestsCallback.resetHistory();
+      getRecommendedMaxBitrateForFrameSizeSpy = sinon.spy(
+        mediaCore,
+        'getRecommendedMaxBitrateForFrameSize'
+      );
+    });
+
+    afterEach(() => {
+      getRecommendedMaxBitrateForFrameSizeSpy.restore();
+    });
+
+    it('returns the default maxPayloadBitsPerSecond if kind is "audio"', () => {
+      const mediaRequestManagerAudio = new MediaRequestManager(sendMediaRequestsCallback, {
+        degradationPreferences,
+        kind: 'audio',
+        trimRequestsToNumOfSources: false,
+      });
+      mediaRequestManagerAudio.setNumCurrentSources(100, 100);
+      sendMediaRequestsCallback.resetHistory();
+
+      mediaRequestManagerAudio.addRequest(
+        {
+          policyInfo: {
+            policy: 'receiver-selected',
+            csi: 123,
+          },
+          receiveSlots: [fakeReceiveSlots[0]],
+          codecInfo: undefined,
+        },
+        false
+      );
+
+      mediaRequestManagerAudio.commit();
+
+      checkMediaRequestsSent(
+        [
+          {
+            policy: 'receiver-selected',
+            csi: 123,
+            receiveSlot: fakeWcmeSlots[0],
+            // returns RecommendedOpusBitrates.FB_MONO_MUSIC as expected:
+            maxPayloadBitsPerSecond: 64000,
+          },
+          // set isCodecInfoDefined to false, since we don't pass in a codec info when audio:
+        ],
+        {isCodecInfoDefined: false}
+      );
+
+      assert.notCalled(getRecommendedMaxBitrateForFrameSizeSpy);
+    });
+
+    it('returns the recommended maxPayloadBitsPerSecond if kind is "video"', () => {
+      mediaRequestManager.addRequest(
+        {
+          policyInfo: {
+            policy: 'receiver-selected',
+            csi: 123,
+          },
+          receiveSlots: [fakeReceiveSlots[0]],
+          codecInfo: {
+            codec: 'h264',
+            maxFs: MAX_FS_1080p,
+            maxFps: MAX_FPS,
+            maxMbps: MAX_MBPS_1080p,
+          },
+        },
+        false
+      );
+
+      mediaRequestManager.commit();
+
+      checkMediaRequestsSent([
+        {
+          policy: 'receiver-selected',
+          csi: 123,
+          receiveSlot: fakeWcmeSlots[0],
+          maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
+          maxFs: MAX_FS_1080p,
+          maxMbps: MAX_MBPS_1080p,
+        },
+      ]);
+
+      // calls the utility function as expected with maxFs passed in (no need to do
+      // further tests here, since the util function itself should be tested for different inputs)
+      assert.calledWith(getRecommendedMaxBitrateForFrameSizeSpy, MAX_FS_1080p);
+    });
+  });
+
+  describe('maxMbps', () => {
+    beforeEach(() => {
+      sendMediaRequestsCallback.resetHistory();
+    });
+
+    it('returns the correct maxMbps value', () => {
+      mediaRequestManager.addRequest(
+        {
+          policyInfo: {
+            policy: 'receiver-selected',
+            csi: 123,
+          },
+          receiveSlots: [fakeReceiveSlots[0]],
+          codecInfo: {
+            codec: 'h264',
+            maxFs: MAX_FS_1080p,
+            maxFps: MAX_FPS,
+            // random value to pass in, to show that the output (below) is calculated
+            // from the maxFs and maxFps values only:
+            maxMbps: 123,
+          },
+        },
+        false
+      );
+
+      mediaRequestManager.commit();
+
+      checkMediaRequestsSent([
+        {
+          policy: 'receiver-selected',
+          csi: 123,
+          receiveSlot: fakeWcmeSlots[0],
+          maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
+          maxFs: MAX_FS_1080p,
+          maxMbps: MAX_MBPS_1080p,
+        },
+      ]);
+    });
+  });
+
+  describe('trimming of requested receive slots', () => {
+    beforeEach(() => {
+      mediaRequestManager = new MediaRequestManager(sendMediaRequestsCallback, {
+        degradationPreferences,
+        kind: 'video',
+        trimRequestsToNumOfSources: true,
+      });
+    });
+
+    const limitNumAvailableStreams = (preferLiveVideo, limit) => {
+      if (preferLiveVideo) {
+        mediaRequestManager.setNumCurrentSources(100, limit);
+      } else {
+        mediaRequestManager.setNumCurrentSources(limit, 1);
+      }
+    };
+
+    [true, false].forEach((preferLiveVideo) =>
+      describe(`preferLiveVideo=${preferLiveVideo}`, () => {
+        it(`trims the active speaker request with lowest priority first and maintains slot order`, () => {
+          // add some receiver-selected and active-speaker requests, in a mixed up order
+          addReceiverSelectedRequest(100, fakeReceiveSlots[0], MAX_FS_360p, false);
+          addActiveSpeakerRequest( // AS request 1 - it will get 1 slot trimmed
+            254,
+            [fakeReceiveSlots[1], fakeReceiveSlots[2], fakeReceiveSlots[3]],
+            MAX_FS_360p,
+            false,
+            preferLiveVideo
+          );
+          addActiveSpeakerRequest( // AS request 2 - lowest priority, it will have all slots trimmed
+            253,
+            [fakeReceiveSlots[7], fakeReceiveSlots[8], fakeReceiveSlots[9]],
+            MAX_FS_360p,
+            false,
+            preferLiveVideo
+          );
+          addActiveSpeakerRequest( // AS request 3 - highest priority, nothing will be trimmed
+            255,
+            [fakeReceiveSlots[4], fakeReceiveSlots[5], fakeReceiveSlots[6]],
+            MAX_FS_360p,
+            false,
+            preferLiveVideo
+          );
+          addReceiverSelectedRequest(101, fakeReceiveSlots[10], MAX_FS_360p, false);
+
+          /* Set number of available streams to 7 so that there will be enough sources only for
+            the 2 RS requests and 2 of the 3 AS requests. The lowest priority AS request will
+            have all the slots trimmed, the second lowest priority AS request will have 1 slot trimmed */
+          limitNumAvailableStreams(preferLiveVideo, 7);
+
+          // check what got trimmed
+          checkMediaRequestsSent([
+            {
+              policy: 'receiver-selected',
+              csi: 100,
+              receiveSlot: fakeWcmeSlots[0],
+              maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_360p,
+              maxFs: MAX_FS_360p,
+              maxMbps: MAX_MBPS_360p,
+            },
+            {
+              policy: 'active-speaker',
+              priority: 254,
+              receiveSlots: [fakeWcmeSlots[1], fakeWcmeSlots[2]], // fakeWcmeSlots[3] got trimmed
+              maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_360p,
+              maxFs: MAX_FS_360p,
+              maxMbps: MAX_MBPS_360p,
+            },
+            // AS request with priority 253 is missing, because all of its slots got trimmed
+            {
+              policy: 'active-speaker',
+              priority: 255,
+              receiveSlots: [fakeWcmeSlots[4], fakeWcmeSlots[5], fakeWcmeSlots[6]],
+              maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_360p,
+              maxFs: MAX_FS_360p,
+              maxMbps: MAX_MBPS_360p,
+            },
+            {
+              policy: 'receiver-selected',
+              csi: 101,
+              receiveSlot: fakeWcmeSlots[10],
+              maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_360p,
+              maxFs: MAX_FS_360p,
+              maxMbps: MAX_MBPS_360p,
+            },
+          ], {preferLiveVideo});
+
+          // now increase the number of available streams so only the last AS request is trimmed by 1
+          limitNumAvailableStreams(preferLiveVideo, 10);
+
+          checkMediaRequestsSent([
+            {
+              policy: 'receiver-selected',
+              csi: 100,
+              receiveSlot: fakeWcmeSlots[0],
+              maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_360p,
+              maxFs: MAX_FS_360p,
+              maxMbps: MAX_MBPS_360p,
+            },
+            {
+              policy: 'active-speaker',
+              priority: 254,
+              receiveSlots: [fakeWcmeSlots[1], fakeWcmeSlots[2], fakeWcmeSlots[3]], // all slots are used, nothing trimmed
+              maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_360p,
+              maxFs: MAX_FS_360p,
+              maxMbps: MAX_MBPS_360p,
+            },
+            {
+              policy: 'active-speaker',
+              priority: 253,
+              receiveSlots: [fakeWcmeSlots[7], fakeWcmeSlots[8]], // only 1 slot is trimmed
+              maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_360p,
+              maxFs: MAX_FS_360p,
+              maxMbps: MAX_MBPS_360p,
+            },
+            {
+              policy: 'active-speaker',
+              priority: 255,
+              receiveSlots: [fakeWcmeSlots[4], fakeWcmeSlots[5], fakeWcmeSlots[6]], // all slots are used, nothing trimmed
+              maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_360p,
+              maxFs: MAX_FS_360p,
+              maxMbps: MAX_MBPS_360p,
+            },
+            {
+              policy: 'receiver-selected',
+              csi: 101,
+              receiveSlot: fakeWcmeSlots[10],
+              maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_360p,
+              maxFs: MAX_FS_360p,
+              maxMbps: MAX_MBPS_360p,
+            },
+          ], {preferLiveVideo});
+        })
+
+        it('does not trim the receiver selected requests', async () => {
+          // add some receiver-selected and active-speaker requests, in a mixed up order
+          addReceiverSelectedRequest(200, fakeReceiveSlots[0], MAX_FS_360p, false);
+          addActiveSpeakerRequest(
+            255,
+            [fakeReceiveSlots[1], fakeReceiveSlots[2], fakeReceiveSlots[3]],
+            MAX_FS_360p,
+            false,
+            preferLiveVideo
+          );
+          addReceiverSelectedRequest(201, fakeReceiveSlots[4], MAX_FS_720p, false);
+          addActiveSpeakerRequest(
+            254,
+            [fakeReceiveSlots[5], fakeReceiveSlots[6], fakeReceiveSlots[7]],
+            MAX_FS_720p,
+            false,
+            preferLiveVideo
+          );
+
+          /* Set number of available streams to 1, which is lower than the number of RS requests,
+            so all AS requests will be trimmed to 0 but RS requests should be unaltered */
+          limitNumAvailableStreams(preferLiveVideo, 1);
+
+          // check what got trimmed - only RS requests should remain
+          checkMediaRequestsSent([
+            {
+              policy: 'receiver-selected',
+              csi: 200,
+              receiveSlot: fakeWcmeSlots[0],
+              maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_360p,
+              maxFs: MAX_FS_360p,
+              maxMbps: MAX_MBPS_360p,
+            },
+            {
+              policy: 'receiver-selected',
+              csi: 201,
+              receiveSlot: fakeWcmeSlots[4],
+              maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_720p,
+              maxFs: MAX_FS_720p,
+              maxMbps: MAX_MBPS_720p,
+            },
+          ], {preferLiveVideo});
+        });
+
+        it('does trimming first and applies degradationPreferences after that', async () => {
+          // add some receiver-selected and active-speaker requests
+          addReceiverSelectedRequest(200, fakeReceiveSlots[0], MAX_FS_360p, false);
+          addActiveSpeakerRequest(
+            255,
+            [fakeReceiveSlots[1], fakeReceiveSlots[2], fakeReceiveSlots[3]],
+            MAX_FS_360p,
+            false,
+            preferLiveVideo
+          );
+          addReceiverSelectedRequest(201, fakeReceiveSlots[4], MAX_FS_720p, false);
+          addActiveSpeakerRequest(
+            254,
+            [fakeReceiveSlots[5], fakeReceiveSlots[6], fakeReceiveSlots[7]],
+            MAX_FS_720p,
+            false,
+            preferLiveVideo
+          );
+
+          // Set maxMacroblocksLimit to a value that's big enough just for the 2 RS requests and 1 AS with 1 slot of 360p.
+          // but not big enough for all of the RS and AS requests. If maxMacroblocksLimit
+          // was applied first, the resolution of all requests (including RS ones) would be degraded
+          // This test verifies that it's not happening and the resolutions are not affected.
+          mediaRequestManager.setDegradationPreferences({maxMacroblocksLimit: MAX_FS_360p + MAX_FS_720p + MAX_FS_360p});
+          sendMediaRequestsCallback.resetHistory();
+
+          /* Limit the num of streams so that only 2 RS requests and 1 AS with 1 slot can be sent out */
+          limitNumAvailableStreams(preferLiveVideo, 3);
+
+          // check what got trimmed - the remaining requests should have unchanged resolutions
+          checkMediaRequestsSent([
+            {
+              policy: 'receiver-selected',
+              csi: 200,
+              receiveSlot: fakeWcmeSlots[0],
+              maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_360p,
+              maxFs: MAX_FS_360p,
+              maxMbps: MAX_MBPS_360p,
+            },
+            {
+              policy: 'active-speaker',
+              priority: 255,
+              receiveSlots: [fakeWcmeSlots[1]],
+              maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_360p,
+              maxFs: MAX_FS_360p,
+              maxMbps: MAX_MBPS_360p,
+            },
+            {
+              policy: 'receiver-selected',
+              csi: 201,
+              receiveSlot: fakeWcmeSlots[4],
+              maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_720p,
+              maxFs: MAX_FS_720p,
+              maxMbps: MAX_MBPS_720p,
+            },
+          ], {preferLiveVideo});
+        });
+
+        it('trims all AS requests completely until setNumCurrentSources() is called with non-zero values', async () => {
+          // add some receiver-selected and active-speaker requests
+          addReceiverSelectedRequest(200, fakeReceiveSlots[0], MAX_FS_360p, false);
+          addActiveSpeakerRequest(
+            255,
+            [fakeReceiveSlots[1], fakeReceiveSlots[2], fakeReceiveSlots[3]],
+            MAX_FS_360p,
+            false,
+            preferLiveVideo
+          );
+          addActiveSpeakerRequest(
+            254,
+            [fakeReceiveSlots[5]],
+            MAX_FS_360p,
+            false,
+            preferLiveVideo
+          );
+
+          mediaRequestManager.commit();
+
+          // we're not calling setNumCurrentSources(), so it should use the initial values of 0 for sources count
+          // and completely trim all AS requests to 0
+          checkMediaRequestsSent([
+            {
+              policy: 'receiver-selected',
+              csi: 200,
+              receiveSlot: fakeWcmeSlots[0],
+              maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_360p,
+              maxFs: MAX_FS_360p,
+              maxMbps: MAX_MBPS_360p,
+            },
+          ], {preferLiveVideo});
+        });
+
+        it('resets num of sources to 0 when reset() is called', async () => {
+          // set available streams to non-zero value
+          limitNumAvailableStreams(preferLiveVideo, 4);
+          sendMediaRequestsCallback.resetHistory();
+
+          // do the reset
+          mediaRequestManager.reset();
+
+          // add some receiver-selected and active-speaker requests
+          addReceiverSelectedRequest(200, fakeReceiveSlots[0], MAX_FS_360p, false);
+          addActiveSpeakerRequest(
+            255,
+            [fakeReceiveSlots[1], fakeReceiveSlots[2], fakeReceiveSlots[3]],
+            MAX_FS_360p,
+            false,
+            preferLiveVideo
+          );
+
+          mediaRequestManager.commit();
+
+          // verify that AS request was trimmed to 0, because we've reset mediaRequestManager so available streams count is 0 now
+          checkMediaRequestsSent([
+            {
+              policy: 'receiver-selected',
+              csi: 200,
+              receiveSlot: fakeWcmeSlots[0],
+              maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_360p,
+              maxFs: MAX_FS_360p,
+              maxMbps: MAX_MBPS_360p,
+            },
+          ], {preferLiveVideo});
+        });
+      })
+    );
+
+
+    it('throws if there are 2 active-speaker requests with different preferLiveVideo values', () => {
+      addActiveSpeakerRequest(
+        255,
+        [fakeReceiveSlots[0]],
+        MAX_FS_360p,
+        false,
+        true
+      );
+      addReceiverSelectedRequest(201, fakeReceiveSlots[4], MAX_FS_720p, false);
+      addActiveSpeakerRequest(
+        254,
+        [fakeReceiveSlots[2]],
+        MAX_FS_360p,
+        false,
+        false
+      );
+
+      assert.throws(() => mediaRequestManager.commit(), 'a mix of active-speaker groups with different values for preferLiveVideo is not supported');
+    })
+  })
 });
+function assertEqual(arg0: any, arg1: string) {
+  throw new Error('Function not implemented.');
+}
+