Replaced CriticalSectionWrapper with rtc::CriticalSection in rtp_rtcp module
Review URL: https://codereview.webrtc.org/1877253002
Cr-Commit-Position: refs/heads/master@{#12359}
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
index 0faf2a4..3e8e47f 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
@@ -49,13 +49,9 @@
receiver_only_(receiver_only),
_lastReceived(0),
_rtpRtcp(*owner),
- _criticalSectionFeedbacks(
- CriticalSectionWrapper::CreateCriticalSection()),
_cbRtcpBandwidthObserver(rtcp_bandwidth_observer),
_cbRtcpIntraFrameObserver(rtcp_intra_frame_observer),
_cbTransportFeedbackObserver(transport_feedback_observer),
- _criticalSectionRTCPReceiver(
- CriticalSectionWrapper::CreateCriticalSection()),
main_ssrc_(0),
_remoteSSRC(0),
_remoteSenderInfo(),
@@ -76,9 +72,6 @@
}
RTCPReceiver::~RTCPReceiver() {
- delete _criticalSectionRTCPReceiver;
- delete _criticalSectionFeedbacks;
-
ReportBlockMap::iterator it = _receivedReportBlockMap.begin();
for (; it != _receivedReportBlockMap.end(); ++it) {
ReportBlockInfoMap* info_map = &(it->second);
@@ -103,12 +96,12 @@
}
int64_t RTCPReceiver::LastReceived() {
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
return _lastReceived;
}
int64_t RTCPReceiver::LastReceivedReceiverReport() const {
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
int64_t last_received_rr = -1;
for (ReceivedInfoMap::const_iterator it = _receivedInfoMap.begin();
it != _receivedInfoMap.end(); ++it) {
@@ -120,7 +113,7 @@
}
void RTCPReceiver::SetRemoteSSRC(uint32_t ssrc) {
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
// new SSRC reset old reports
memset(&_remoteSenderInfo, 0, sizeof(_remoteSenderInfo));
@@ -131,7 +124,7 @@
}
uint32_t RTCPReceiver::RemoteSSRC() const {
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
return _remoteSSRC;
}
@@ -139,7 +132,7 @@
const std::set<uint32_t>& registered_ssrcs) {
uint32_t old_ssrc = 0;
{
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
old_ssrc = main_ssrc_;
main_ssrc_ = main_ssrc;
registered_ssrcs_ = registered_ssrcs;
@@ -156,7 +149,7 @@
int64_t* avgRTT,
int64_t* minRTT,
int64_t* maxRTT) const {
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
RTCPReportBlockInformation* reportBlock =
GetReportBlockInformation(remoteSSRC, main_ssrc_);
@@ -180,13 +173,13 @@
}
void RTCPReceiver::SetRtcpXrRrtrStatus(bool enable) {
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
xr_rrtr_status_ = enable;
}
bool RTCPReceiver::GetAndResetXrRrRtt(int64_t* rtt_ms) {
assert(rtt_ms);
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
if (xr_rr_rtt_ms_ == 0) {
return false;
}
@@ -202,7 +195,7 @@
uint32_t* RTCPArrivalTimeFrac,
uint32_t* rtcp_timestamp) const
{
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
if(ReceivedNTPsecs)
{
*ReceivedNTPsecs = _remoteSenderInfo.NTPseconds; // NTP from incoming SendReport
@@ -228,7 +221,7 @@
bool RTCPReceiver::LastReceivedXrReferenceTimeInfo(
RtcpReceiveTimeInfo* info) const {
assert(info);
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
if (_lastReceivedXRNTPsecs == 0 && _lastReceivedXRNTPfrac == 0) {
return false;
}
@@ -251,7 +244,7 @@
int32_t RTCPReceiver::SenderInfoReceived(RTCPSenderInfo* senderInfo) const {
assert(senderInfo);
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
if (_lastReceivedSRNTPsecs == 0) {
return -1;
}
@@ -264,7 +257,7 @@
int32_t RTCPReceiver::StatisticsReceived(
std::vector<RTCPReportBlock>* receiveBlocks) const {
assert(receiveBlocks);
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
ReportBlockMap::const_iterator it = _receivedReportBlockMap.begin();
for (; it != _receivedReportBlockMap.end(); ++it) {
const ReportBlockInfoMap* info_map = &(it->second);
@@ -280,7 +273,7 @@
RTCPReceiver::IncomingRTCPPacket(RTCPPacketInformation& rtcpPacketInformation,
RTCPUtility::RTCPParserV2* rtcpParser)
{
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
_lastReceived = _clock->TimeInMilliseconds();
@@ -590,7 +583,7 @@
RTCPCnameInformation*
RTCPReceiver::CreateCnameInformation(uint32_t remoteSSRC) {
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
std::map<uint32_t, RTCPCnameInformation*>::iterator it =
_receivedCnameMap.find(remoteSSRC);
@@ -606,7 +599,7 @@
RTCPCnameInformation*
RTCPReceiver::GetCnameInformation(uint32_t remoteSSRC) const {
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
std::map<uint32_t, RTCPCnameInformation*>::const_iterator it =
_receivedCnameMap.find(remoteSSRC);
@@ -619,7 +612,7 @@
RTCPReceiveInformation*
RTCPReceiver::CreateReceiveInformation(uint32_t remoteSSRC) {
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
std::map<uint32_t, RTCPReceiveInformation*>::iterator it =
_receivedInfoMap.find(remoteSSRC);
@@ -634,7 +627,7 @@
RTCPReceiveInformation*
RTCPReceiver::GetReceiveInformation(uint32_t remoteSSRC) {
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
std::map<uint32_t, RTCPReceiveInformation*>::iterator it =
_receivedInfoMap.find(remoteSSRC);
@@ -651,7 +644,7 @@
}
bool RTCPReceiver::RtcpRrTimeout(int64_t rtcp_interval_ms) {
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
if (_lastReceivedRrMs == 0)
return false;
@@ -665,7 +658,7 @@
}
bool RTCPReceiver::RtcpRrSequenceNumberTimeout(int64_t rtcp_interval_ms) {
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
if (_lastIncreasedSequenceNumberMs == 0)
return false;
@@ -680,7 +673,7 @@
}
bool RTCPReceiver::UpdateRTCPReceiveInformationTimers() {
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
bool updateBoundingSet = false;
int64_t timeNow = _clock->TimeInMilliseconds();
@@ -724,7 +717,7 @@
}
int32_t RTCPReceiver::BoundingSet(bool* tmmbrOwner, TMMBRSet* boundingSetRec) {
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
std::map<uint32_t, RTCPReceiveInformation*>::iterator receiveInfoIt =
_receivedInfoMap.find(_remoteSSRC);
@@ -773,7 +766,7 @@
cnameInfo->name[RTCP_CNAME_SIZE - 1] = 0;
strncpy(cnameInfo->name, rtcpPacket.CName.CName, RTCP_CNAME_SIZE - 1);
{
- CriticalSectionScoped lock(_criticalSectionFeedbacks);
+ rtc::CritScope lock(&_criticalSectionFeedbacks);
if (stats_callback_ != NULL) {
stats_callback_->CNameChanged(rtcpPacket.CName.CName,
rtcpPacket.CName.SenderSSRC);
@@ -1283,12 +1276,12 @@
void RTCPReceiver::RegisterRtcpStatisticsCallback(
RtcpStatisticsCallback* callback) {
- CriticalSectionScoped cs(_criticalSectionFeedbacks);
+ rtc::CritScope cs(&_criticalSectionFeedbacks);
stats_callback_ = callback;
}
RtcpStatisticsCallback* RTCPReceiver::GetRtcpStatisticsCallback() {
- CriticalSectionScoped cs(_criticalSectionFeedbacks);
+ rtc::CritScope cs(&_criticalSectionFeedbacks);
return stats_callback_;
}
@@ -1305,7 +1298,7 @@
std::set<uint32_t> registered_ssrcs;
{
// We don't want to hold this critsect when triggering the callbacks below.
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
local_ssrc = main_ssrc_;
registered_ssrcs = registered_ssrcs_;
}
@@ -1378,7 +1371,7 @@
}
if (!receiver_only_) {
- CriticalSectionScoped cs(_criticalSectionFeedbacks);
+ rtc::CritScope cs(&_criticalSectionFeedbacks);
if (stats_callback_) {
for (ReportBlockList::const_iterator it =
rtcpPacketInformation.report_blocks.begin();
@@ -1400,7 +1393,7 @@
char cName[RTCP_CNAME_SIZE]) const {
assert(cName);
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
RTCPCnameInformation* cnameInfo = GetCnameInformation(remoteSSRC);
if (cnameInfo == NULL) {
return -1;
@@ -1414,7 +1407,7 @@
int32_t RTCPReceiver::TMMBRReceived(uint32_t size,
uint32_t accNumCandidates,
TMMBRSet* candidateSet) const {
- CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
+ rtc::CritScope lock(&_criticalSectionRTCPReceiver);
std::map<uint32_t, RTCPReceiveInformation*>::const_iterator
receiveInfoIt = _receivedInfoMap.begin();