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

Migrate a leftover in test/ to webrtc::Mutex.

Browse Source 
Bug: webrtc:11567
Change-Id: I53cce9336d239091b0f805ac0f84c2df89cf2dd1
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178908
Reviewed-by: Magnus Flodman <mflodman@webrtc.org>
Commit-Queue: Markus Handell <handellm@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31689}
This commit is contained in:
Markus Handell
2020-07-09 15:18:06 +02:00
committed by Commit Bot
parent 73ecede5ad
commit 60ed459962
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/rtp_header_parser.cc
View File

@ -13,7 +13,7 @@
#include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
#include "modules/rtp_rtcp/source/rtp_utility.h"
#include "rtc_base/critical_section.h"
#include "rtc_base/synchronization/mutex.h"
#include "rtc_base/thread_annotations.h"
namespace webrtc {
@ -34,9 +34,8 @@ class RtpHeaderParserImpl : public RtpHeaderParser {
bool DeregisterRtpHeaderExtension(RtpExtension extension) override;
private:
rtc::CriticalSection critical_section_;
RtpHeaderExtensionMap rtp_header_extension_map_
RTC_GUARDED_BY(critical_section_);
mutable Mutex mutex_;
RtpHeaderExtensionMap rtp_header_extension_map_ RTC_GUARDED_BY(mutex_);
};
std::unique_ptr<RtpHeaderParser> RtpHeaderParser::CreateForTest() {
@ -68,7 +67,7 @@ bool RtpHeaderParserImpl::Parse(const uint8_t* packet,
RtpHeaderExtensionMap map;
{
rtc::CritScope cs(&critical_section_);
MutexLock lock(&mutex_);
map = rtp_header_extension_map_;
}
@ -79,24 +78,24 @@ bool RtpHeaderParserImpl::Parse(const uint8_t* packet,
return true;
}
bool RtpHeaderParserImpl::RegisterRtpHeaderExtension(RtpExtension extension) {
rtc::CritScope cs(&critical_section_);
MutexLock lock(&mutex_);
return rtp_header_extension_map_.RegisterByUri(extension.id, extension.uri);
}
bool RtpHeaderParserImpl::RegisterRtpHeaderExtension(RTPExtensionType type,
uint8_t id) {
rtc::CritScope cs(&critical_section_);
MutexLock lock(&mutex_);
return rtp_header_extension_map_.RegisterByType(id, type);
}
bool RtpHeaderParserImpl::DeregisterRtpHeaderExtension(RtpExtension extension) {
rtc::CritScope cs(&critical_section_);
MutexLock lock(&mutex_);
return rtp_header_extension_map_.Deregister(
rtp_header_extension_map_.GetType(extension.id));
}
bool RtpHeaderParserImpl::DeregisterRtpHeaderExtension(RTPExtensionType type) {
rtc::CritScope cs(&critical_section_);
MutexLock lock(&mutex_);
return rtp_header_extension_map_.Deregister(type) == 0;
}
} // namespace webrtc