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

webrtc/media/base/fakemediaengine.h

 /*
  *  Copyright (c) 2004 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 232 matching lines @@
     DtmfInfo(uint32_t ssrc, int event_code, int duration)
         : ssrc(ssrc),
           event_code(event_code),
           duration(duration) {}
     uint32_t ssrc;
     int event_code;
     int duration;
   };
   explicit FakeVoiceMediaChannel(FakeVoiceEngine* engine,
                                  const AudioOptions& options)
-      : engine_(engine), time_since_last_typing_(-1), max_bps_(-1) {
+      : engine_(engine), time_since_last_typing_(-1) {
     output_scalings_[0] = 1.0;  // For default channel.
     SetOptions(options);
   }
   ~FakeVoiceMediaChannel();
   const std::vector<AudioCodec>& recv_codecs() const { return recv_codecs_; }
   const std::vector<AudioCodec>& send_codecs() const { return send_codecs_; }
   const std::vector<AudioCodec>& codecs() const { return send_codecs(); }
   const std::vector<DtmfInfo>& dtmf_info_queue() const {
     return dtmf_info_queue_;
   }
   const AudioOptions& options() const { return options_; }
-  int max_bps() const { return max_bps_; }
+  rtc::Optional<int> max_bps() const { return max_bps_; }
   virtual bool SetSendParameters(const AudioSendParameters& params) {
     return (SetSendCodecs(params.codecs) &&
             SetSendRtpHeaderExtensions(params.extensions) &&
-            SetMaxSendBandwidth(params.max_bandwidth_bps) &&
+            SetMaxSendBitrate(params.max_bitrate_bps) &&
             SetOptions(params.options));
   }
 
   virtual bool SetRecvParameters(const AudioRecvParameters& params) {
     return (SetRecvCodecs(params.codecs) &&
             SetRecvRtpHeaderExtensions(params.extensions));
   }
 
   virtual bool SetPlayout(bool playout) {
     set_playout(playout);
@@ skipping 113 matching lines @@
     return true;
   }
   bool SetSendCodecs(const std::vector<AudioCodec>& codecs) {
     if (fail_set_send_codecs()) {
       // Fake the failure in SetSendCodecs.
       return false;
     }
     send_codecs_ = codecs;
     return true;
   }
-  bool SetMaxSendBandwidth(int bps) {
+  bool SetMaxSendBitrate(rtc::Optional<int> bps) {
     max_bps_ = bps;
     return true;
   }
   bool SetOptions(const AudioOptions& options) {
     // Does a "merge" of current options and set options.
     options_.SetAll(options);
     return true;
   }
   bool SetLocalSource(uint32_t ssrc, AudioSource* source) {
     auto it = local_sinks_.find(ssrc);
@@ skipping 15 matching lines @@
 
   FakeVoiceEngine* engine_;
   std::vector<AudioCodec> recv_codecs_;
   std::vector<AudioCodec> send_codecs_;
   std::map<uint32_t, double> output_scalings_;
   std::vector<DtmfInfo> dtmf_info_queue_;
   int time_since_last_typing_;
   AudioOptions options_;
   std::map<uint32_t, VoiceChannelAudioSink*> local_sinks_;
   std::unique_ptr<webrtc::AudioSinkInterface> sink_;
-  int max_bps_;
+  rtc::Optional<int> max_bps_;
 };
 
 // A helper function to compare the FakeVoiceMediaChannel::DtmfInfo.
 inline bool CompareDtmfInfo(const FakeVoiceMediaChannel::DtmfInfo& info,
                             uint32_t ssrc,
                             int event_code,
                             int duration) {
   return (info.duration == duration && info.event_code == event_code &&
           info.ssrc == ssrc);
 }
 
 class FakeVideoMediaChannel : public RtpHelper<VideoMediaChannel> {
  public:
   explicit FakeVideoMediaChannel(FakeVideoEngine* engine,
                                  const VideoOptions& options)
-      : engine_(engine), max_bps_(-1) {
+      : engine_(engine) {
     SetOptions(options);
   }
 
   ~FakeVideoMediaChannel();
 
   const std::vector<VideoCodec>& recv_codecs() const { return recv_codecs_; }
   const std::vector<VideoCodec>& send_codecs() const { return send_codecs_; }
   const std::vector<VideoCodec>& codecs() const { return send_codecs(); }
   bool rendering() const { return playout(); }
   const VideoOptions& options() const { return options_; }
   const std::map<uint32_t, rtc::VideoSinkInterface<VideoFrame>*>& sinks()
       const {
     return sinks_;
   }
-  int max_bps() const { return max_bps_; }
+  rtc::Optional<int> max_bps() const { return max_bps_; }
   virtual bool SetSendParameters(const VideoSendParameters& params) {
     return (SetSendCodecs(params.codecs) &&
             SetSendRtpHeaderExtensions(params.extensions) &&
-            SetMaxSendBandwidth(params.max_bandwidth_bps));
+            SetMaxSendBitrate(params.max_bitrate_bps));
   }
   virtual bool SetRecvParameters(const VideoRecvParameters& params) {
     return (SetRecvCodecs(params.codecs) &&
             SetRecvRtpHeaderExtensions(params.extensions));
   }
   virtual bool AddSendStream(const StreamParams& sp) {
     return RtpHelper<VideoMediaChannel>::AddSendStream(sp);
   }
   virtual bool RemoveSendStream(uint32_t ssrc) {
     return RtpHelper<VideoMediaChannel>::RemoveSendStream(ssrc);
@@ skipping 65 matching lines @@
       return false;
     }
     send_codecs_ = codecs;
 
     return true;
   }
   bool SetOptions(const VideoOptions& options) {
     options_ = options;
     return true;
   }
-  bool SetMaxSendBandwidth(int bps) {
+  bool SetMaxSendBitrate(rtc::Optional<int> bps) {
     max_bps_ = bps;
     return true;
   }
 
   FakeVideoEngine* engine_;
   std::vector<VideoCodec> recv_codecs_;
   std::vector<VideoCodec> send_codecs_;
   std::map<uint32_t, rtc::VideoSinkInterface<VideoFrame>*> sinks_;
   std::map<uint32_t, VideoCapturer*> capturers_;
   VideoOptions options_;
-  int max_bps_;
+  rtc::Optional<int> max_bps_;
 };
 
 // Dummy option class, needed for the DataTraits abstraction in
 // channel_unittest.c.
 class DataOptions {};
 
 class FakeDataMediaChannel : public RtpHelper<DataMediaChannel> {
  public:
   explicit FakeDataMediaChannel(void* unused, const DataOptions& options)
-      : send_blocked_(false), max_bps_(-1) {}
+      : send_blocked_(false) {}
   ~FakeDataMediaChannel() {}
   const std::vector<DataCodec>& recv_codecs() const { return recv_codecs_; }
   const std::vector<DataCodec>& send_codecs() const { return send_codecs_; }
   const std::vector<DataCodec>& codecs() const { return send_codecs(); }
-  int max_bps() const { return max_bps_; }
+  rtc::Optional<int> max_bps() const { return max_bps_; }
 
   virtual bool SetSendParameters(const DataSendParameters& params) {
     return (SetSendCodecs(params.codecs) &&
-            SetMaxSendBandwidth(params.max_bandwidth_bps));
+            SetMaxSendBitrate(params.max_bitrate_bps));
   }
   virtual bool SetRecvParameters(const DataRecvParameters& params) {
     return SetRecvCodecs(params.codecs);
   }
   virtual bool SetSend(bool send) { return set_sending(send); }
   virtual bool SetReceive(bool receive) {
     set_playout(receive);
     return true;
   }
   virtual bool AddRecvStream(const StreamParams& sp) {
@@ skipping 35 matching lines @@
     return true;
   }
   bool SetSendCodecs(const std::vector<DataCodec>& codecs) {
     if (fail_set_send_codecs()) {
       // Fake the failure in SetSendCodecs.
       return false;
     }
     send_codecs_ = codecs;
     return true;
   }
-  bool SetMaxSendBandwidth(int bps) {
+  bool SetMaxSendBitrate(rtc::Optional<int> bps) {
     max_bps_ = bps;
     return true;
   }
 
   std::vector<DataCodec> recv_codecs_;
   std::vector<DataCodec> send_codecs_;
   SendDataParams last_sent_data_params_;
   std::string last_sent_data_;
   bool send_blocked_;
-  int max_bps_;
+  rtc::Optional<int> max_bps_;
 };
 
 // A base class for all of the shared parts between FakeVoiceEngine
 // and FakeVideoEngine.
 class FakeBaseEngine {
  public:
   FakeBaseEngine()
       : options_changed_(false),
         fail_create_channel_(false) {}
   void set_fail_create_channel(bool fail) { fail_create_channel_ = fail; }
@@ skipping 225 matching lines @@
 
  private:
   std::vector<FakeDataMediaChannel*> channels_;
   std::vector<DataCodec> data_codecs_;
   DataChannelType last_channel_type_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_BASE_FAKEMEDIAENGINE_H_