Remove use of RtpHeaderExtension and clean up

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 17 matching lines @@
 #include "webrtc/p2p/base/transport.h"
 #include "webrtc/p2p/base/transportdescriptionfactory.h"
 
 namespace cricket {
 
 class ChannelManager;
 typedef std::vector<AudioCodec> AudioCodecs;
 typedef std::vector<VideoCodec> VideoCodecs;
 typedef std::vector<DataCodec> DataCodecs;
 typedef std::vector<CryptoParams> CryptoParamsVec;
-typedef std::vector<RtpHeaderExtension> RtpHeaderExtensions;
+typedef std::vector<webrtc::RtpExtension> RtpHeaderExtensions;

[the sun, 2016/05/30 16:00:17]

Is this actually used anywhere? ...

 
 enum MediaType {
   MEDIA_TYPE_AUDIO,
   MEDIA_TYPE_VIDEO,
   MEDIA_TYPE_DATA
 };
 
 std::string MediaTypeToString(MediaType type);
 
 enum MediaContentDirection {
@@ skipping 149 matching lines @@
     crypto_required_ = type;
   }
 
   const RtpHeaderExtensions& rtp_header_extensions() const {
     return rtp_header_extensions_;
   }
   void set_rtp_header_extensions(const RtpHeaderExtensions& extensions) {
     rtp_header_extensions_ = extensions;
     rtp_header_extensions_set_ = true;
   }
-  void AddRtpHeaderExtension(const RtpHeaderExtension& ext) {
+  void AddRtpHeaderExtension(const webrtc::RtpExtension& ext) {
     rtp_header_extensions_.push_back(ext);
     rtp_header_extensions_set_ = true;
   }
   void ClearRtpHeaderExtensions() {
     rtp_header_extensions_.clear();
     rtp_header_extensions_set_ = true;
   }
   // We can't always tell if an empty list of header extensions is
   // because the other side doesn't support them, or just isn't hooked up to
   // signal them. For now we assume an empty list means no signaling, but
@@ skipping 58 matching lines @@
   }
   int buffered_mode_latency() const { return buffered_mode_latency_; }
 
  protected:
   bool rtcp_mux_ = false;
   bool rtcp_reduced_size_ = false;
   int bandwidth_ = kAutoBandwidth;
   std::string protocol_;
   std::vector<CryptoParams> cryptos_;
   CryptoType crypto_required_ = CT_NONE;
-  std::vector<RtpHeaderExtension> rtp_header_extensions_;
+  std::vector<webrtc::RtpExtension> rtp_header_extensions_;

[the sun, 2016/05/30 16:00:17]

...it could be used here.

   bool rtp_header_extensions_set_ = false;
   bool multistream_ = false;
   StreamParamsVec streams_;
   bool conference_mode_ = false;
   bool partial_ = false;
   int buffered_mode_latency_ = kBufferedModeDisabled;
   MediaContentDirection direction_ = MD_SENDRECV;
 };
 
 template <class C>
@@ skipping 259 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  // WEBRTC_PC_MEDIASESSION_H_