Simplify and extend RtpHeaderExtensionMap

webrtc/modules/rtp_rtcp/source/rtp_header_extensions.cc

Index: webrtc/modules/rtp_rtcp/source/rtp_header_extensions.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.cc b/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.cc
index 1356069ca9c138d6288819ac7f2200563afc7443..f941095a2ce751103b5b8b2a203e619bcfceca21 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.cc
@@ -33,8 +33,8 @@ namespace webrtc {
 //   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 constexpr RTPExtensionType AbsoluteSendTime::kId;
 constexpr uint8_t AbsoluteSendTime::kValueSizeBytes;
-const char* const AbsoluteSendTime::kUri =
-    "http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time";
+// constexpr char AbsoluteSendTime::kUri[59];

[sprang_webrtc, 2016/11/08 16:13:37]

?

[danilchap, 2016/11/08 17:13:41]

oops, left over from my tries to make kUri constexpr.
removed

+constexpr const char* AbsoluteSendTime::kUri;
 
 bool AbsoluteSendTime::Parse(const uint8_t* data, uint32_t* time_24bits) {
   *time_24bits = ByteReader<uint32_t, 3>::ReadBigEndian(data);
@@ -60,8 +60,7 @@ bool AbsoluteSendTime::Write(uint8_t* data, int64_t time_ms) {
 //
 constexpr RTPExtensionType AudioLevel::kId;
 constexpr uint8_t AudioLevel::kValueSizeBytes;
-const char* const AudioLevel::kUri =
-    "urn:ietf:params:rtp-hdrext:ssrc-audio-level";
+constexpr const char* AudioLevel::kUri;
 
 bool AudioLevel::Parse(const uint8_t* data,
                        bool* voice_activity,
@@ -97,8 +96,7 @@ bool AudioLevel::Write(uint8_t* data,
 //   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 constexpr RTPExtensionType TransmissionOffset::kId;
 constexpr uint8_t TransmissionOffset::kValueSizeBytes;
-const char* const TransmissionOffset::kUri =
-    "urn:ietf:params:rtp-hdrext:toffset";
+constexpr const char* TransmissionOffset::kUri;
 
 bool TransmissionOffset::Parse(const uint8_t* data, int32_t* rtp_time) {
   *rtp_time = ByteReader<int32_t, 3>::ReadBigEndian(data);
@@ -118,8 +116,7 @@ bool TransmissionOffset::Write(uint8_t* data, int32_t rtp_time) {
 //  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 constexpr RTPExtensionType TransportSequenceNumber::kId;
 constexpr uint8_t TransportSequenceNumber::kValueSizeBytes;
-const char* const TransportSequenceNumber::kUri =
-    "http://www.ietf.org/id/draft-holmer-rmcat-transport-wide-cc-extensions";
+constexpr const char* TransportSequenceNumber::kUri;
 
 bool TransportSequenceNumber::Parse(const uint8_t* data, uint16_t* value) {
   *value = ByteReader<uint16_t>::ReadBigEndian(data);
@@ -144,7 +141,7 @@ bool TransportSequenceNumber::Write(uint8_t* data, uint16_t value) {
 //   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 constexpr RTPExtensionType VideoOrientation::kId;
 constexpr uint8_t VideoOrientation::kValueSizeBytes;
-const char* const VideoOrientation::kUri = "urn:3gpp:video-orientation";
+constexpr const char* VideoOrientation::kUri;
 
 bool VideoOrientation::Parse(const uint8_t* data, VideoRotation* rotation) {
   *rotation = ConvertCVOByteToVideoRotation(data[0]);
@@ -173,8 +170,7 @@ bool VideoOrientation::Write(uint8_t* data, uint8_t value) {
 //  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 constexpr RTPExtensionType PlayoutDelayLimits::kId;
 constexpr uint8_t PlayoutDelayLimits::kValueSizeBytes;
-const char* const PlayoutDelayLimits::kUri =
-    "http://www.webrtc.org/experiments/rtp-hdrext/playout-delay";
+constexpr const char* PlayoutDelayLimits::kUri;
 
 bool PlayoutDelayLimits::Parse(const uint8_t* data,
                                PlayoutDelay* playout_delay) {