commit 42ca68ab7264154e16291c99f1de7338abc56af7
author danilchap <danilchap@webrtc.org> Mon Oct 31 10:34:40 2016
committer Commit bot <commit-bot@chromium.org> Mon Oct 31 10:34:45 2016
tree e0020cbe04b02800fead76ab8e6a275407f3eef8
parent 051f678808d03fb2e68fe2a084b1deeb326c71bf

Ensure one does not register same rtp header extension with different id
Added assert to RtpHeaderExtensionMap
Altered tests that did.

BUG=webrtc:1994

Review-Url: https://codereview.webrtc.org/2462663002
Cr-Commit-Position: refs/heads/master@{#14840}

webrtc/modules/rtp_rtcp/source/rtp_header_extension.cc

diff --git a/webrtc/modules/rtp_rtcp/source/rtp_header_extension.cc b/webrtc/modules/rtp_rtcp/source/rtp_header_extension.cc
index 27bbda4..7fdff34 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_header_extension.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_header_extension.cc
@@ -10,12 +10,15 @@
 
 #include <assert.h>
 
+#include "webrtc/base/checks.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
 
 namespace webrtc {
 
+constexpr uint8_t RtpHeaderExtensionMap::kInvalidId;
+
 RtpHeaderExtensionMap::RtpHeaderExtensionMap() {
 }
 
@@ -48,6 +51,7 @@
     // so return success.
     return 0;
   }
+  RTC_DCHECK_EQ(kInvalidId, GetId(type));
   extensionMap_[id] = new HeaderExtension(type);
   return 0;
 }

webrtc/video/video_send_stream_tests.cc

diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc
index 2663516..61ca9f0 100644
--- a/webrtc/video/video_send_stream_tests.cc
+++ b/webrtc/video/video_send_stream_tests.cc
@@ -212,7 +212,7 @@
 }
 
 TEST_F(VideoSendStreamTest, SupportsTransportWideSequenceNumbers) {
-  static const uint8_t kExtensionId = 13;
+  static const uint8_t kExtensionId = test::kTransportSequenceNumberExtensionId;
   class TransportWideSequenceNumberObserver : public test::SendTest {
    public:
     TransportWideSequenceNumberObserver()
@@ -1215,7 +1215,7 @@
 TEST_F(VideoSendStreamTest, ChangingNetworkRoute) {
   static const int kStartBitrateBps = 300000;
   static const int kNewMaxBitrateBps = 1234567;
-  static const uint8_t kExtensionId = 13;
+  static const uint8_t kExtensionId = test::kTransportSequenceNumberExtensionId;
   class ChangingNetworkRouteTest : public test::EndToEndTest {
    public:
     ChangingNetworkRouteTest()