Fix issues with setMaxVideoBW and updateSimulcastLayersBitrate (#1733)

lynckia · Jul 1, 2021 · 2cccc6f · 2cccc6f
1 parent 28e6434
commit 2cccc6f
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/erizo_controller/erizoClient/src/Stream.js b/erizo_controller/erizoClient/src/Stream.js
@@ -84,6 +84,14 @@ const Stream = (altConnectionHelpers, specInput) => {
       const translated = (maxVideoBW * 1000 * 0.90) - (50 * 40 * 8);
       log.info(`message: Setting maxVideoBW, streamId: ${that.getID()}, maxVideoBW: ${maxVideoBW}, translated: ${translated}`);
       that.maxVideoBW = translated;
+      // Make sure all the current parameters respect the new limit
+      if (videoSenderLicodeParameters) {
+        Object.keys(videoSenderLicodeParameters).forEach((key) => {
+          const senderParam = videoSenderLicodeParameters[key];
+          senderParam.maxBitrate = senderParam.maxBitrate > that.maxVideoBW ?
+            that.maxVideoBW : senderParam.maxBitrate;
+        });
+      }
     } else {
       that.maxVideoBW = maxVideoBW;
     }
@@ -617,16 +625,14 @@ const Stream = (altConnectionHelpers, specInput) => {
   that.updateSimulcastLayersBitrate = (bitrates) => {
     if (that.pc && that.local) {
       // limit with maxVideoBW
-      const limitedBitrates = bitrates;
+      const limitedBitrates = Object.assign({}, bitrates);
       Object.keys(limitedBitrates).forEach((key) => {
         // explicitly passing undefined means assigning the max for that layer
         if (limitedBitrates[key] > that.maxVideoBW || limitedBitrates[key] === undefined) {
           log.info('message: updateSimulcastLayersBitrate defaulting to max bitrate,' +
           `, layer :${key}, requested: ${limitedBitrates[key]}, max: ${that.maxVideoBW}`);
           limitedBitrates[key] = that.maxVideoBW;
         }
-        limitedBitrates[key] =
-          limitedBitrates[key] > that.maxVideoBW ? that.maxVideoBW : limitedBitrates[key];
       });
       setEncodingConfig('maxBitrate', limitedBitrates);
       that.applySenderEncoderParameters();