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

webrtc/pc/mediasession.h

 /*
  *  Copyright 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 55 matching lines @@
 extern const char kMediaProtocolDtlsSavpf[];
 
 extern const char kMediaProtocolRtpPrefix[];
 
 extern const char kMediaProtocolSctp[];
 extern const char kMediaProtocolDtlsSctp[];
 extern const char kMediaProtocolUdpDtlsSctp[];
 extern const char kMediaProtocolTcpDtlsSctp[];
 
 // Options to control how session descriptions are generated.
-const int kAutoBandwidth = -1;
 const int kBufferedModeDisabled = 0;
 
 struct MediaSessionOptions {
-  MediaSessionOptions() :
-      recv_audio(true),
-      recv_video(false),
-      data_channel_type(DCT_NONE),
-      is_muc(false),
-      vad_enabled(true),  // When disabled, removes all CN codecs from SDP.
-      rtcp_mux_enabled(true),
-      bundle_enabled(false),
-      video_bandwidth(kAutoBandwidth),
-      data_bandwidth(kDataMaxBandwidth) {
-  }
+  MediaSessionOptions()
+      : recv_audio(true),
+        recv_video(false),
+        data_channel_type(DCT_NONE),
+        is_muc(false),
+        vad_enabled(true),  // When disabled, removes all CN codecs from SDP.
+        rtcp_mux_enabled(true),
+        bundle_enabled(false),
+        video_bandwidth(rtc::Optional<int>()),
+        data_bandwidth(rtc::Optional<int>(kDataMaxBandwidth)) {}
 
   bool has_audio() const {
     return recv_audio || HasSendMediaStream(MEDIA_TYPE_AUDIO);
   }
   bool has_video() const {
     return recv_video || HasSendMediaStream(MEDIA_TYPE_VIDEO);
   }
   bool has_data() const { return data_channel_type != DCT_NONE; }
 
   // Add a stream with MediaType type and id.
@@ skipping 20 matching lines @@
   // structure (content name -> options).
   // MediaSessionDescriptionFactory assumes there will never be more than one
   // audio/video/data content, but this will change with unified plan.
   bool recv_audio;
   bool recv_video;
   DataChannelType data_channel_type;
   bool is_muc;
   bool vad_enabled;
   bool rtcp_mux_enabled;
   bool bundle_enabled;
-  // bps. -1 == auto.
-  int video_bandwidth;
-  int data_bandwidth;
+  // bps. not set == auto.
+  rtc::Optional<int> video_bandwidth;
+  rtc::Optional<int> data_bandwidth;
   // content name ("mid") => options.
   std::map<std::string, TransportOptions> transport_options;
 
   struct Stream {
     Stream(MediaType type,
            const std::string& id,
            const std::string& sync_label,
            int num_sim_layers)
         : type(type), id(id), sync_label(sync_label),
           num_sim_layers(num_sim_layers) {
@@ skipping 27 matching lines @@
   }
 
   bool rtcp_mux() const { return rtcp_mux_; }
   void set_rtcp_mux(bool mux) { rtcp_mux_ = mux; }
 
   bool rtcp_reduced_size() const { return rtcp_reduced_size_; }
   void set_rtcp_reduced_size(bool reduced_size) {
     rtcp_reduced_size_ = reduced_size;
   }
 
-  int bandwidth() const { return bandwidth_; }
-  void set_bandwidth(int bandwidth) { bandwidth_ = bandwidth; }
+  rtc::Optional<int> bandwidth() const { return bandwidth_; }
+  void set_bandwidth(rtc::Optional<int> bandwidth) { bandwidth_ = bandwidth; }
 
   const std::vector<CryptoParams>& cryptos() const { return cryptos_; }
   void AddCrypto(const CryptoParams& params) {
     cryptos_.push_back(params);
   }
   void set_cryptos(const std::vector<CryptoParams>& cryptos) {
     cryptos_ = cryptos;
   }
 
   CryptoType crypto_required() const { return crypto_required_; }
@@ skipping 76 matching lines @@
   bool partial() const { return partial_;  }
 
   void set_buffered_mode_latency(int latency) {
     buffered_mode_latency_ = latency;
   }
   int buffered_mode_latency() const { return buffered_mode_latency_; }
 
  protected:
   bool rtcp_mux_ = false;
   bool rtcp_reduced_size_ = false;
-  int bandwidth_ = kAutoBandwidth;
+  rtc::Optional<int> bandwidth_ = rtc::Optional<int>();
   std::string protocol_;
   std::vector<CryptoParams> cryptos_;
   CryptoType crypto_required_ = CT_NONE;
   std::vector<RtpHeaderExtension> rtp_header_extensions_;
   bool rtp_header_extensions_set_ = false;
   bool multistream_ = false;
   StreamParamsVec streams_;
   bool conference_mode_ = false;
   bool partial_ = false;
   int buffered_mode_latency_ = kBufferedModeDisabled;
@@ skipping 252 matching lines @@
 void GetSupportedVideoCryptoSuiteNames(
     std::vector<std::string>* crypto_suite_names);
 void GetSupportedDataCryptoSuiteNames(
     std::vector<std::string>* crypto_suite_names);
 void GetDefaultSrtpCryptoSuiteNames(
     std::vector<std::string>* crypto_suite_names);
 
 }  // namespace cricket
 
 #endif  // TALK_SESSION_MEDIA_MEDIASESSION_H_