zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup: Replacing set extension status bool with CHECK.

Browse Source 
This was just checked in all places were it was used, moving the check
into RtpRtcp reduces the boiler plate required at the call sites.

Also changing to always register and unregister extensions by URI to
synchronize the code in AudioSendStream with the code in RtpVideoSender.

This prepares for reducing the scope of ChannelSend.

Bug: webrtc:9883
Change-Id: Ia64d79f20eb98f46cbbbe8318770e4fcf9caa1ec
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/155620
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29490}
This commit is contained in:
Sebastian Jansson
2019-10-14 17:32:21 +02:00
committed by Commit Bot
parent ffc8452730
commit f39c815a1d
11 changed files with 53 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/rtp_rtcp/source/rtp_header_extension_map.cc
View File

@ -85,7 +85,7 @@ bool RtpHeaderExtensionMap::RegisterByType(int id, RTPExtensionType type) {
return false;
}
bool RtpHeaderExtensionMap::RegisterByUri(int id, const std::string& uri) {
bool RtpHeaderExtensionMap::RegisterByUri(int id, absl::string_view uri) {
for (const ExtensionInfo& extension : kExtensions)
if (uri == extension.uri)
return Register(id, extension.type, extension.uri);
@ -113,6 +113,15 @@ int32_t RtpHeaderExtensionMap::Deregister(RTPExtensionType type) {
return 0;
}
void RtpHeaderExtensionMap::Deregister(absl::string_view uri) {
for (const ExtensionInfo& extension : kExtensions) {
if (extension.uri == uri) {
ids_[extension.type] = kInvalidId;
break;
}
}
}
bool RtpHeaderExtensionMap::Register(int id,
RTPExtensionType type,
const char* uri) {