[Draft] RtpPacket sketched.

webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h

Index: webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h b/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h
index cdbf806170d3478faa0eb9622be993bb79c7ecb1..619ccbc0ca3edcd1c228d2b493643e30e5489d6a 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h
+++ b/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h
@@ -13,15 +13,13 @@
 #include "webrtc/base/basictypes.h"
 #include "webrtc/call.h"
 #include "webrtc/common_video/rotation.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 
 namespace webrtc {
 
 class AbsoluteSendTime {
  public:
-  static constexpr RTPExtensionType kId = kRtpExtensionAbsoluteSendTime;
   static constexpr uint8_t kValueSizeBytes = 3;
-  static const char* kName;
+  static const char* kId;
   static bool IsSupportedFor(MediaType type);
   static bool Parse(const uint8_t* data, uint32_t* time_ms);
   static bool Write(uint8_t* data, int64_t time_ms);
@@ -29,9 +27,8 @@ class AbsoluteSendTime {
 
 class AudioLevel {
  public:
-  static constexpr RTPExtensionType kId = kRtpExtensionAudioLevel;
   static constexpr uint8_t kValueSizeBytes = 1;
-  static const char* kName;
+  static const char* kId;
   static bool IsSupportedFor(MediaType type);
   static bool Parse(const uint8_t* data,
                     bool* voice_activity,
@@ -41,9 +38,8 @@ class AudioLevel {
 
 class TransmissionOffset {
  public:
-  static constexpr RTPExtensionType kId = kRtpExtensionTransmissionTimeOffset;
   static constexpr uint8_t kValueSizeBytes = 3;
-  static const char* kName;
+  static const char* kId;
   static bool IsSupportedFor(MediaType type);
   static bool Parse(const uint8_t* data, int32_t* time_ms);
   static bool Write(uint8_t* data, int64_t time_ms);
@@ -51,9 +47,8 @@ class TransmissionOffset {
 
 class TransportSequenceNumber {
  public:
-  static constexpr RTPExtensionType kId = kRtpExtensionTransportSequenceNumber;
   static constexpr uint8_t kValueSizeBytes = 2;
-  static const char* kName;
+  static const char* kId;
   static bool IsSupportedFor(MediaType type);
   static bool Parse(const uint8_t* data, uint16_t* value);
   static bool Write(uint8_t* data, uint16_t value);
@@ -61,9 +56,8 @@ class TransportSequenceNumber {
 
 class VideoOrientation {
  public:
-  static constexpr RTPExtensionType kId = kRtpExtensionVideoRotation;
   static constexpr uint8_t kValueSizeBytes = 1;
-  static const char* kName;
+  static const char* kId;
   static bool IsSupportedFor(MediaType type);
   static bool Parse(const uint8_t* data, VideoRotation* value);
   static bool Write(uint8_t* data, VideoRotation value);