From fab482b32684b65f2ad9c6c7a967a4802dacff82 Mon Sep 17 00:00:00 2001 From: danilchap Date: Tue, 4 Apr 2017 02:33:48 -0700 Subject: [PATCH] Simplify RTPSender::RegisterRtpHeaderExtension DCHECK instead of run-time check extension type is correct. BUG=webrtc:1994 Review-Url: https://codereview.webrtc.org/2795723002 Cr-Commit-Position: refs/heads/master@{#17524} --- webrtc/modules/rtp_rtcp/source/rtp_sender.cc | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc index 52b0891ea7..6fdac6f63f 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc @@ -186,20 +186,7 @@ uint32_t RTPSender::NackOverheadRate() const { int32_t RTPSender::RegisterRtpHeaderExtension(RTPExtensionType type, uint8_t id) { rtc::CritScope lock(&send_critsect_); - switch (type) { - case kRtpExtensionVideoRotation: - case kRtpExtensionPlayoutDelay: - case kRtpExtensionTransmissionTimeOffset: - case kRtpExtensionAbsoluteSendTime: - case kRtpExtensionAudioLevel: - case kRtpExtensionTransportSequenceNumber: - return rtp_header_extension_map_.Register(type, id); - case kRtpExtensionNone: - case kRtpExtensionNumberOfExtensions: - LOG(LS_ERROR) << "Invalid RTP extension type for registration."; - return -1; - } - return -1; + return rtp_header_extension_map_.RegisterByType(id, type) ? 0 : -1; } bool RTPSender::IsRtpHeaderExtensionRegistered(RTPExtensionType type) const {