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

webrtc/media/base/rtpdataengine.cc

 /*
  *  Copyright (c) 2012 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 121 matching lines @@
         "Failed to SetSendCodecs because there is no known codec.";
     return false;
   }
 
   send_codecs_ = codecs;
   return true;
 }
 
 bool RtpDataMediaChannel::SetSendParameters(const DataSendParameters& params) {
   return (SetSendCodecs(params.codecs) &&
-          SetMaxSendBandwidth(params.max_bandwidth_bps));
+          SetMaxSendBandwidth(params.max_bitrate_bps));
 }
 
 bool RtpDataMediaChannel::SetRecvParameters(const DataRecvParameters& params) {
   return SetRecvCodecs(params.codecs);
 }
 
 bool RtpDataMediaChannel::AddSendStream(const StreamParams& stream) {
   if (!stream.has_ssrcs()) {
     return false;
   }
@@ skipping 105 matching lines @@
   //              << ", timestamp=" << header.timestamp
   //              << ", len=" << data_len;
 
   ReceiveDataParams params;
   params.ssrc = header.ssrc;
   params.seq_num = header.seq_num;
   params.timestamp = header.timestamp;
   SignalDataReceived(params, data, data_len);
 }
 
-bool RtpDataMediaChannel::SetMaxSendBandwidth(int bps) {
-  if (bps <= 0) {
-    bps = kDataMaxBandwidth;
+bool RtpDataMediaChannel::SetMaxSendBandwidth(rtc::Optional<int> bitrate) {
+  int bps = kDataMaxBandwidth;
+  if (bitrate && *bitrate > 0) {
+    bps = *bitrate;
   }
   send_limiter_.reset(new rtc::RateLimiter(bps / 8, 1.0));
   LOG(LS_INFO) << "RtpDataMediaChannel::SetSendBandwidth to " << bps << "bps.";
   return true;
 }
 
 bool RtpDataMediaChannel::SendData(
     const SendDataParams& params,
     const rtc::CopyOnWriteBuffer& payload,
     SendDataResult* result) {
@@ skipping 63 matching lines @@
 
   MediaChannel::SendPacket(&packet, rtc::PacketOptions());
   send_limiter_->Use(packet_len, now);
   if (result) {
     *result = SDR_SUCCESS;
   }
   return true;
 }
 
 }  // namespace cricket