fix the video send bitrate params when not specifiying codecs

vugga · Sep 7, 2017 · cb9954a · cb9954a
1 parent 62cd75a
commit cb9954a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/web_app/js/sdputils.js b/src/web_app/js/sdputils.js
@@ -195,8 +195,15 @@ function maybeSetVideoSendInitialBitRate(sdp, params) {
     trace('Failed to find video m-line');
     return sdp;
   }
-
-  var codec = params.videoRecvCodec;
+  // Figure out the first codec payload type on the m=video SDP line.
+  var videoMLine = sdpLines[mLineIndex]
+  var pattern = new RegExp('m=video\\s\\d+\\s[A-Z\/]+\\s')
+  var sendPayloadType = videoMLine.split(pattern)[1].split(' ')[0]
+  var fmtpLine = sdpLines[findLine(sdpLines, 'a=rtpmap', sendPayloadType)]
+  var codecName = fmtpLine.split('a=rtpmap:' + sendPayloadType)[1].split('/')[0]
+
+  // Use codec from params if specified via URL param, otherwise use from SDP.
+  var codec = params.videoSendCodec || codecName;
   sdp = setCodecParam(sdp, codec, 'x-google-min-bitrate',
       params.videoSendInitialBitrate.toString());
   sdp = setCodecParam(sdp, codec, 'x-google-max-bitrate',
@@ -205,6 +212,7 @@ function maybeSetVideoSendInitialBitRate(sdp, params) {
   return sdp;
 }
 
+
 function removePayloadTypeFromMline(mLine, payloadType) {
   mLine = mLine.split(' ');
   for (var i = 0; i < mLine.length; ++i) {