Add start and hard min bitrate (lynckia#1184)

Arri98 · Apr 4, 2018 · 02c24ce · 02c24ce
1 parent 1a41464
commit 02c24ce
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 3 deletions.
diff --git a/doc/client_api.md b/doc/client_api.md
@@ -395,6 +395,14 @@ We can also force the client to use a TURN server when publishing by setting the
 room.publish(localStream, {forceTurn: true});
 ```
 
+There are two options that allow advance control of video bitrate in Chrome:
+- `startVideoBW`: Configures Chrome to start sending video at the specified bitrate instead of the default one. 
+- `hardMinVideoBW`: Configures a hard limit for the minimum video bitrate. 
+
+```
+room.publish(localStream, {startVideoBW: 1000, hardMinVideoBW:500});
+```
+
 In `room.publish` you can include a callback with two parameters, `id` and `error`. If the stream has been published, `id` contains the id of that stream. On the other hand, if there has been any kind of error, `id` is `undefined` and the error is described in `error`.
 
 <example>

diff --git a/erizo_controller/common/semanticSdp/CodecInfo.js b/erizo_controller/common/semanticSdp/CodecInfo.js
@@ -50,6 +50,10 @@ class CodecInfo {
     return this.params;
   }
 
+  setParam(paramName, value) {
+    this.params[paramName] = value;
+  }
+
   hasRTX() {
     return this.rtx;
   }

diff --git a/erizo_controller/erizoClient/src/Room.js b/erizo_controller/erizoClient/src/Room.js
@@ -175,9 +175,12 @@ const Room = (altIo, altConnectionHelpers, altConnectionManager, specInput) => {
       limitMaxVideoBW: spec.maxVideoBW,
       label: stream.getLabel(),
       iceServers: that.iceServers,
-      forceTurn: stream.forceTurn };
+      forceTurn: stream.forceTurn,
+    };
     if (!isRemote) {
       connectionOpts.simulcast = options.simulcast;
+      connectionOpts.startVideoBW = options.startVideoBW;
+      connectionOpts.hardMinVideoBW = options.hardMinVideoBW;
     }
     return connectionOpts;
   };

diff --git a/erizo_controller/erizoClient/src/utils/SdpHelpers.js b/erizo_controller/erizoClient/src/utils/SdpHelpers.js
@@ -49,4 +49,14 @@ SdpHelpers.enableOpusNacks = (sdpInput) => {
   return sdp;
 };
 
+SdpHelpers.setParamForCodecs = (sdpInfo, mediaType, paramName, value) => {
+  sdpInfo.medias.forEach((mediaInfo) => {
+    if (mediaInfo.id === mediaType) {
+      mediaInfo.codecs.forEach((codec) => {
+        codec.setParam(paramName, value);
+      });
+    }
+  });
+};
+
 export default SdpHelpers;
diff --git a/erizo_controller/erizoClient/src/webrtc-stacks/BaseStack.js b/erizo_controller/erizoClient/src/webrtc-stacks/BaseStack.js
@@ -143,12 +143,15 @@ const BaseStack = (specInput) => {
       return;
     }
     Logger.info('Set remote and local description');
-    Logger.debug('Remote Description', msg.sdp);
-    Logger.debug('Local Description', localDesc.sdp);
     latestSessionVersion = sessionVersion;
 
     SdpHelpers.setMaxBW(remoteSdp, specBase);
+    that.setStartVideoBW(remoteSdp);
+    that.setHardMinVideoBW(remoteSdp);
+
     msg.sdp = remoteSdp.toString();
+    Logger.debug('Remote Description', msg.sdp);
+    Logger.debug('Local Description', localDesc.sdp);
     that.remoteSdp = remoteSdp;
 
     remoteDesc = msg;
@@ -206,6 +209,16 @@ const BaseStack = (specInput) => {
   that.peerConnection.onicecandidate = onIceCandidate;
   // public functions
 
+  that.setStartVideoBW = (sdpInput) => {
+    Logger.error('startVideoBW not implemented for this browser');
+    return sdpInput;
+  };
+
+  that.setHardMinVideoBW = (sdpInput) => {
+    Logger.error('hardMinVideoBw not implemented for this browser');
+    return sdpInput;
+  };
+
   that.enableSimulcast = (sdpInput) => {
     Logger.error('Simulcast not implemented');
     return sdpInput;

diff --git a/erizo_controller/erizoClient/src/webrtc-stacks/ChromeStableStack.js b/erizo_controller/erizoClient/src/webrtc-stacks/ChromeStableStack.js
@@ -66,6 +66,20 @@ const ChromeStableStack = (specInput) => {
     return sdp.replace(matchGroup[0], result);
   };
 
+  that.setStartVideoBW = (sdpInfo) => {
+    if (spec.video && spec.startVideoBW) {
+      Logger.debug(`startVideoBW requested: ${spec.startVideoBW}`);
+      SdpHelpers.setParamForCodecs(sdpInfo, 'video', 'x-google-start-bitrate', spec.startVideoBW);
+    }
+  };
+
+  that.setHardMinVideoBW = (sdpInfo) => {
+    if (spec.video && spec.hardMinVideoBW) {
+      Logger.debug(`hardMinVideoBW requested: ${spec.hardMinVideoBW}`);
+      SdpHelpers.setParamForCodecs(sdpInfo, 'video', 'x-google-min-bitrate', spec.hardMinVideoBW);
+    }
+  };
+
   return that;
 };