admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure one does not register same rtp header extension with different id

Browse Source 
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}
This commit is contained in:
danilchap 2016-10-31 03:34:40 -07:00 committed by Commit bot
parent 051f678808
commit 42ca68ab72
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/rtp_rtcp/source/rtp_header_extension.cc
View File

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

4
webrtc/video/video_send_stream_tests.cc
View File

@ -212,7 +212,7 @@ TEST_F(VideoSendStreamTest, SupportsTransmissionTimeOffset) {
} }
TEST_F(VideoSendStreamTest, SupportsTransportWideSequenceNumbers) { TEST_F(VideoSendStreamTest, SupportsTransportWideSequenceNumbers) {
static const uint8_t kExtensionId = 13; static const uint8_t kExtensionId = test::kTransportSequenceNumberExtensionId;
class TransportWideSequenceNumberObserver : public test::SendTest { class TransportWideSequenceNumberObserver : public test::SendTest {
public: public:
TransportWideSequenceNumberObserver() TransportWideSequenceNumberObserver()
@ -1215,7 +1215,7 @@ TEST_F(VideoSendStreamTest, MinTransmitBitrateRespectsRemb) {
TEST_F(VideoSendStreamTest, ChangingNetworkRoute) { TEST_F(VideoSendStreamTest, ChangingNetworkRoute) {
static const int kStartBitrateBps = 300000; static const int kStartBitrateBps = 300000;
static const int kNewMaxBitrateBps = 1234567; static const int kNewMaxBitrateBps = 1234567;
static const uint8_t kExtensionId = 13; static const uint8_t kExtensionId = test::kTransportSequenceNumberExtensionId;
class ChangingNetworkRouteTest : public test::EndToEndTest { class ChangingNetworkRouteTest : public test::EndToEndTest {
public: public:
ChangingNetworkRouteTest() ChangingNetworkRouteTest()