Index: webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h |
diff --git a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h |
index 6da8334da6e9fa564cb422d8d77c5d731ce7d62e..39679673d08f8a5864b2f21a52d7e51cf19fd943 100644 |
--- a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h |
+++ b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h |
@@ -16,15 +16,12 @@ |
#include <algorithm> |
#include <map> |
-#include "webrtc/base/scoped_ptr.h" |
+#include "webrtc/base/criticalsection.h" |
#include "webrtc/modules/rtp_rtcp/source/bitrate.h" |
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h" |
#include "webrtc/system_wrappers/include/ntp_time.h" |
namespace webrtc { |
-class CriticalSectionWrapper; |
- |
class StreamStatisticianImpl : public StreamStatistician { |
public: |
StreamStatisticianImpl(Clock* clock, |
@@ -57,11 +54,11 @@ class StreamStatisticianImpl : public StreamStatistician { |
void UpdateCounters(const RTPHeader& rtp_header, |
size_t packet_length, |
bool retransmitted); |
- void NotifyRtpCallback() LOCKS_EXCLUDED(stream_lock_.get()); |
- void NotifyRtcpCallback() LOCKS_EXCLUDED(stream_lock_.get()); |
+ void NotifyRtpCallback() LOCKS_EXCLUDED(stream_lock_); |
+ void NotifyRtcpCallback() LOCKS_EXCLUDED(stream_lock_); |
Clock* clock_; |
- rtc::scoped_ptr<CriticalSectionWrapper> stream_lock_; |
+ rtc::CriticalSection stream_lock_; |
Bitrate incoming_bitrate_; |
uint32_t ssrc_; |
int max_reordering_threshold_; // In number of packets or sequence numbers. |
@@ -131,7 +128,7 @@ class ReceiveStatisticsImpl : public ReceiveStatistics, |
typedef std::map<uint32_t, StreamStatisticianImpl*> StatisticianImplMap; |
Clock* clock_; |
- rtc::scoped_ptr<CriticalSectionWrapper> receive_statistics_lock_; |
+ rtc::CriticalSection receive_statistics_lock_; |
int64_t last_rate_update_ms_; |
StatisticianImplMap statisticians_; |