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

Cleanup RtpHeaderExtensionMap removing use of two legacy functions

Browse Source 
BUG=webrtc:1994

Review-Url: https://codereview.webrtc.org/2491273002
Cr-Commit-Position: refs/heads/master@{#15366}
This commit is contained in:
danilchap 2016-12-01 08:39:35 -08:00 committed by Commit bot
parent 73f2ee2556
commit 1454669c1d
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/modules/rtp_rtcp/source/rtp_header_extension.h
View File

@ -77,11 +77,6 @@ class RtpHeaderExtensionMap {
return RegisterByType(id, type) ? 0 : -1;
}
int32_t Deregister(RTPExtensionType type);
int32_t GetType(uint8_t id, RTPExtensionType* type) const {
*type = GetType(id);
return *type == kInvalidType ? -1 : 0;
}
void GetCopy(RtpHeaderExtensionMap* copy) const { *copy = *this; }
private:
static constexpr uint8_t kMinId = 1;

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

@ -53,7 +53,7 @@ bool RtpHeaderParserImpl::Parse(const uint8_t* packet,
RtpHeaderExtensionMap map;
{
rtc::CritScope cs(&critical_section_);
rtp_header_extension_map_.GetCopy(&map);
map = rtp_header_extension_map_;
}
const bool valid_rtpheader = rtp_parser.Parse(header, &map);
@ -66,7 +66,7 @@ bool RtpHeaderParserImpl::Parse(const uint8_t* packet,
bool RtpHeaderParserImpl::RegisterRtpHeaderExtension(RTPExtensionType type,
uint8_t id) {
rtc::CritScope cs(&critical_section_);
return rtp_header_extension_map_.Register(type, id) == 0;
return rtp_header_extension_map_.RegisterByType(id, type);
}
bool RtpHeaderParserImpl::DeregisterRtpHeaderExtension(RTPExtensionType type) {

9
webrtc/modules/rtp_rtcp/source/rtp_utility.cc
View File

@ -336,8 +336,8 @@ void RtpHeaderParser::ParseOneByteExtensionHeader(
return;
}
RTPExtensionType type;
if (ptrExtensionMap->GetType(id, &type) != 0) {
RTPExtensionType type = ptrExtensionMap->GetType(id);
if (type == RtpHeaderExtensionMap::kInvalidType) {
// If we encounter an unknown extension, just skip over it.
LOG(LS_WARNING) << "Failed to find extension id: " << id;
} else {
@ -444,8 +444,9 @@ void RtpHeaderParser::ParseOneByteExtensionHeader(
max_playout_delay * kPlayoutDelayGranularityMs;
break;
}
default: {
LOG(LS_WARNING) << "Extension type not implemented: " << type;
case kRtpExtensionNone:
case kRtpExtensionNumberOfExtensions: {
RTC_NOTREACHED() << "Invalid extension type: " << type;
return;
}
}