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

Migrate modules/rtp_rtcp to webrtc::Mutex.

Browse Source 
Bug: webrtc:11567
Change-Id: I4c71f3a28ef875af2c232b1b553840d6e21649d3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178804
Commit-Queue: Markus Handell <handellm@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31645}
This commit is contained in:
Markus Handell
2020-07-07 11:44:28 +02:00
committed by Commit Bot
parent 6deec38ede
commit e7c015e112
33 changed files with 273 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/rtp_rtcp/source/receive_statistics_impl.h
View File

@ -18,8 +18,8 @@
#include "absl/types/optional.h"
#include "modules/include/module_common_types_public.h"
#include "modules/rtp_rtcp/include/receive_statistics.h"
#include "rtc_base/critical_section.h"
#include "rtc_base/rate_statistics.h"
#include "rtc_base/synchronization/mutex.h"
#include "rtc_base/thread_annotations.h"
namespace webrtc {
@ -65,7 +65,7 @@ class StreamStatisticianImpl : public StreamStatistician {
const uint32_t ssrc_;
Clock* const clock_;
rtc::CriticalSection stream_lock_;
mutable Mutex stream_lock_;
RateStatistics incoming_bitrate_ RTC_GUARDED_BY(&stream_lock_);
// In number of packets or sequence numbers.
int max_reordering_threshold_ RTC_GUARDED_BY(&stream_lock_);
@ -123,7 +123,7 @@ class ReceiveStatisticsImpl : public ReceiveStatistics {
StreamStatisticianImpl* GetOrCreateStatistician(uint32_t ssrc);
Clock* const clock_;
rtc::CriticalSection receive_statistics_lock_;
mutable Mutex receive_statistics_lock_;
uint32_t last_returned_ssrc_;
int max_reordering_threshold_ RTC_GUARDED_BY(receive_statistics_lock_);
std::map<uint32_t, StreamStatisticianImpl*> statisticians_