Remove use of RtpHeaderExtension and clean up

webrtc/config.h

 /*
  *  Copyright (c) 2013 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 34 matching lines @@
 
   // Payload type used for RED packets.
   int red_payload_type;
 
   // RTX payload type for RED payload.
   int red_rtx_payload_type;
 };
 
 // RTP header extension, see RFC 5285.
 struct RtpExtension {
-  RtpExtension(const std::string& name, int id) : name(name), id(id) {}
+  RtpExtension() : id(0) {}
+  RtpExtension(const std::string& uri, int id) : uri(uri), id(id) {}
   std::string ToString() const;
   bool operator==(const RtpExtension& rhs) const {
-    return name == rhs.name && id == rhs.id;
+    return uri == rhs.uri && id == rhs.id;
   }
-  static bool IsSupportedForAudio(const std::string& name);
-  static bool IsSupportedForVideo(const std::string& name);
+  static bool IsSupportedForAudio(const std::string& uri);
+  static bool IsSupportedForVideo(const std::string& uri);
 
-  static const char* kTOffset;
-  static const char* kAbsSendTime;
-  static const char* kVideoRotation;
-  static const char* kAudioLevel;
-  static const char* kTransportSequenceNumber;
-  std::string name;
+  static const char* kAudioLevelUri;
+  static const int kAudioLevelId;

[danilchap, 2016/05/17 18:07:15]

Ids are decided at runtime, so probably shouldn't create static consts for them.
or name those constants DefaultId (to be used when extensions are proposed or in
tests).

[Irfan, 2016/05/17 18:13:39]

These constants are defining values for specific extensions. As far as I could
see, the IDs for these defined extensions do not change at run time or am I
mistaken ? It appeared tests were the only place they were being modified ?

+
+  static const char* kTimestampOffsetUri;
+  static const int kTimestampOffsetId;
+
+  static const char* kAbsSendTimeUri;
+  static const int kAbsSendTimeId;
+
+  static const char* kVideoRotationUri;
+  static const int kVideoRotationId;
+
+  static const char* kTransportSequenceNumberUri;
+  static const int kTransportSequenceNumberId;
+
+  std::string uri;
   int id;
 };
 
 struct VideoStream {
   VideoStream();
   ~VideoStream();
   std::string ToString() const;
 
   size_t width;
   size_t height;
@@ skipping 65 matching lines @@
 struct VoicePacing {
   VoicePacing() : enabled(false) {}
   explicit VoicePacing(bool value) : enabled(value) {}
   static const ConfigOptionID identifier = ConfigOptionID::kVoicePacing;
   bool enabled;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_CONFIG_H_