Fix Simulcast Quality Layers (lynckia#1723)

wuzenghui · Jun 14, 2021 · d460f3c · d460f3c
1 parent 9f646c8
commit d460f3c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 32 deletions.
diff --git a/erizo_controller/erizoClient/src/ErizoConnectionManager.js b/erizo_controller/erizoClient/src/ErizoConnectionManager.js
@@ -122,7 +122,7 @@ class ErizoConnection extends EventEmitterConst {
     log.debug(`message: Adding stream to Connection, ${this.toLog()}, ${stream.toLog()}`);
     this.streamsMap.add(stream.getID(), stream);
     if (stream.local) {
-      this.stack.addStream(stream.stream);
+      this.stack.addStream(stream.stream, stream.hasScreen());
     }
   }
 

diff --git a/erizo_controller/erizoClient/src/webrtc-stacks/BaseStack.js b/erizo_controller/erizoClient/src/webrtc-stacks/BaseStack.js
@@ -184,33 +184,31 @@ const BaseStack = (specInput) => {
 
   const defaultSimulcastSpatialLayers = 3;
 
-  const possibleLayers = [
-    { rid: '3' },
-    { rid: '2', scaleResolutionDownBy: 2 },
-    { rid: '1', scaleResolutionDownBy: 4 },
-  ];
-
-  const getSimulcastParameters = () => {
-    let numSpatialLayers = that.simulcast.numSpatialLayers || defaultSimulcastSpatialLayers;
-    const totalLayers = possibleLayers.length;
-    numSpatialLayers = numSpatialLayers < totalLayers ?
-      numSpatialLayers : totalLayers;
+  const scaleResolutionDownBase = 2;
+  const scaleResolutionDownBaseScreenshare = 1;
+
+  const getSimulcastParameters = (isScreenshare) => {
+    const numSpatialLayers = that.simulcast.numSpatialLayers || defaultSimulcastSpatialLayers;
     const parameters = [];
+    const base = isScreenshare ? scaleResolutionDownBaseScreenshare : scaleResolutionDownBase;
 
-    for (let layer = totalLayers - 1; layer >= totalLayers - numSpatialLayers; layer -= 1) {
-      parameters.push(possibleLayers[layer]);
+    for (let layer = 1; layer <= numSpatialLayers; layer += 1) {
+      parameters.push({
+        rid: (layer).toString(),
+        scaleResolutionDownBy: base ** (numSpatialLayers - layer),
+      });
     }
     return parameters;
   };
 
-  that.addStream = (streamInput) => {
+  that.addStream = (streamInput, isScreenshare) => {
     const stream = streamInput;
     stream.transceivers = [];
     stream.getTracks().forEach(async (track) => {
       let options = {};
       if (track.kind === 'video' && that.simulcast) {
         options = {
-          sendEncodings: getSimulcastParameters(),
+          sendEncodings: getSimulcastParameters(isScreenshare),
         };
       }
       options.streams = [stream];

diff --git a/erizo_controller/erizoClient/src/webrtc-stacks/FirefoxStack.js b/erizo_controller/erizoClient/src/webrtc-stacks/FirefoxStack.js
@@ -5,39 +5,37 @@ const log = Logger.module('FirefoxStack');
 
 const defaultSimulcastSpatialLayers = 3;
 
-const possibleLayers = [
-  { rid: '3' },
-  { rid: '2', scaleResolutionDownBy: 2 },
-  { rid: '1', scaleResolutionDownBy: 4 },
-];
+const scaleResolutionDownBase = 2;
+const scaleResolutionDownBaseScreenshare = 1;
 
 const FirefoxStack = (specInput) => {
   log.debug('message: Starting Firefox stack');
   const that = BaseStack(specInput);
 
   that.enableSimulcast = sdp => sdp;
 
-  const getSimulcastParameters = () => {
-    let numSpatialLayers = that.simulcast.numSpatialLayers || defaultSimulcastSpatialLayers;
-    const totalLayers = possibleLayers.length;
-    numSpatialLayers = numSpatialLayers < totalLayers ?
-      numSpatialLayers : totalLayers;
+  const getSimulcastParameters = (isScreenshare) => {
+    const numSpatialLayers = that.simulcast.numSpatialLayers || defaultSimulcastSpatialLayers;
     const parameters = [];
+    const base = isScreenshare ? scaleResolutionDownBaseScreenshare : scaleResolutionDownBase;
 
-    for (let layer = totalLayers - 1; layer >= totalLayers - numSpatialLayers; layer -= 1) {
-      parameters.push(possibleLayers[layer]);
+    for (let layer = 1; layer <= numSpatialLayers; layer += 1) {
+      parameters.push({
+        rid: (layer).toString(),
+        scaleResolutionDownBy: base ** (numSpatialLayers - layer),
+      });
     }
     return parameters;
   };
 
-  const getSimulcastParametersForFirefox = (sender) => {
+  const getSimulcastParametersForFirefox = (sender, isScreenshare) => {
     const parameters = sender.getParameters() || {};
-    parameters.encodings = getSimulcastParameters();
+    parameters.encodings = getSimulcastParameters(isScreenshare);
 
     return sender.setParameters(parameters);
   };
 
-  that.addStream = (streamInput) => {
+  that.addStream = (streamInput, isScreenshare) => {
     const stream = streamInput;
     stream.transceivers = [];
     stream.getTracks().forEach(async (track) => {
@@ -51,7 +49,7 @@ const FirefoxStack = (specInput) => {
       const transceiver = that.peerConnection.addTransceiver(track, options);
       stream.transceivers.push(transceiver);
       if (track.kind === 'video' && that.simulcast) {
-        getSimulcastParametersForFirefox(transceiver.sender).catch(() => {});
+        getSimulcastParametersForFirefox(transceiver.sender, isScreenshare).catch(() => {});
       }
     });
   };