Updated structures and functions for setting the max bitrate limit to take rtc::Optional<int>

webrtc/media/engine/simulcast.cc

 /*
  *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 153 matching lines @@
     total_max_bitrate_bps += streams[s].target_bitrate_bps;
   }
   total_max_bitrate_bps += streams.back().max_bitrate_bps;
   return total_max_bitrate_bps;
 }
 
 std::vector<webrtc::VideoStream> GetSimulcastConfig(
     size_t max_streams,
     int width,
     int height,
-    int max_bitrate_bps,
+    rtc::Optional<int> max_bitrate_bps,
     int max_qp,
     int max_framerate) {
   size_t simulcast_layers = FindSimulcastMaxLayers(width, height);
   if (simulcast_layers > max_streams) {
     // If the number of SSRCs in the group differs from our target
     // number of simulcast streams for current resolution, switch down
     // to a resolution that matches our number of SSRCs.
     if (!SlotSimulcastMaxResolution(max_streams, &width, &height)) {
       return std::vector<webrtc::VideoStream>();
     }
@@ skipping 24 matching lines @@
     streams[s].max_qp = max_qp;
     streams[s].max_framerate = max_framerate;
     width /= 2;
     height /= 2;
     if (s == 0) {
       break;
     }
   }
 
   // Spend additional bits to boost the max stream.
-  int bitrate_left_bps = max_bitrate_bps - GetTotalMaxBitrateBps(streams);
-  if (bitrate_left_bps > 0) {
-    streams.back().max_bitrate_bps += bitrate_left_bps;
+  if (max_bitrate_bps) {
+    int bitrate_left_bps = *max_bitrate_bps - GetTotalMaxBitrateBps(streams);
+    if (bitrate_left_bps > 0) {
+      streams.back().max_bitrate_bps += bitrate_left_bps;
+    }
   }
 
   return streams;
 }
 
 static const int kScreenshareMinBitrateKbps = 50;
 static const int kScreenshareMaxBitrateKbps = 6000;
 static const int kScreenshareDefaultTl0BitrateKbps = 200;
 static const int kScreenshareDefaultTl1BitrateKbps = 1000;
 
@@ skipping 35 matching lines @@
     return false;
   }
 
   config->tl0_bitrate_kbps = tl0_bitrate;
   config->tl1_bitrate_kbps = tl1_bitrate;
 
   return true;
 }
 
 }  // namespace cricket