Remove use of RtpHeaderExtension and clean up

webrtc/config.h

Index: webrtc/config.h
diff --git a/webrtc/config.h b/webrtc/config.h
index 06460ae359641a533c7fdc4615e51637e72fb2ba..71ed4eec2af947c48f78181d06347b2aaf75014e 100644
--- a/webrtc/config.h
+++ b/webrtc/config.h
@@ -52,20 +52,31 @@ struct FecConfig {
 
 // 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 const char* kTOffset;
-  static const char* kAbsSendTime;
-  static const char* kVideoRotation;
-  static const char* kAudioLevel;
-  static const char* kTransportSequenceNumber;
-  std::string name;
+  static bool IsSupportedForAudio(const std::string& uri);
+  static bool IsSupportedForVideo(const std::string& uri);
+
+  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;
 };