Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtcp_receiver.h

Issue 1877253002: Replaced CriticalSectionWrapper with rtc::CriticalSection in rtp_rtcp module (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: git cl format dtmf_queue.cc Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_H_ 11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_H_
12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_H_ 12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_H_
13 13
14 #include <map> 14 #include <map>
15 #include <set> 15 #include <set>
16 #include <vector> 16 #include <vector>
17 17
18 #include "webrtc/base/criticalsection.h"
18 #include "webrtc/base/thread_annotations.h" 19 #include "webrtc/base/thread_annotations.h"
19 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 20 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
20 #include "webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h" 21 #include "webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h"
21 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h" 22 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
22 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" 23 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
23 #include "webrtc/modules/rtp_rtcp/source/tmmbr_help.h" 24 #include "webrtc/modules/rtp_rtcp/source/tmmbr_help.h"
24 #include "webrtc/typedefs.h" 25 #include "webrtc/typedefs.h"
25 26
26 namespace webrtc { 27 namespace webrtc {
27 class ModuleRtpRtcpImpl; 28 class ModuleRtpRtcpImpl;
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver); 261 EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
261 RTCPHelp::RTCPReportBlockInformation* GetReportBlockInformation( 262 RTCPHelp::RTCPReportBlockInformation* GetReportBlockInformation(
262 uint32_t remote_ssrc, uint32_t source_ssrc) const 263 uint32_t remote_ssrc, uint32_t source_ssrc) const
263 EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver); 264 EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
264 265
265 Clock* const _clock; 266 Clock* const _clock;
266 const bool receiver_only_; 267 const bool receiver_only_;
267 int64_t _lastReceived; 268 int64_t _lastReceived;
268 ModuleRtpRtcpImpl& _rtpRtcp; 269 ModuleRtpRtcpImpl& _rtpRtcp;
269 270
270 CriticalSectionWrapper* _criticalSectionFeedbacks; 271 rtc::CriticalSection _criticalSectionFeedbacks;
271 RtcpBandwidthObserver* const _cbRtcpBandwidthObserver; 272 RtcpBandwidthObserver* const _cbRtcpBandwidthObserver;
272 RtcpIntraFrameObserver* const _cbRtcpIntraFrameObserver; 273 RtcpIntraFrameObserver* const _cbRtcpIntraFrameObserver;
273 TransportFeedbackObserver* const _cbTransportFeedbackObserver; 274 TransportFeedbackObserver* const _cbTransportFeedbackObserver;
274 275
275 CriticalSectionWrapper* _criticalSectionRTCPReceiver; 276 rtc::CriticalSection _criticalSectionRTCPReceiver;
276 uint32_t main_ssrc_ GUARDED_BY(_criticalSectionRTCPReceiver); 277 uint32_t main_ssrc_ GUARDED_BY(_criticalSectionRTCPReceiver);
277 uint32_t _remoteSSRC GUARDED_BY(_criticalSectionRTCPReceiver); 278 uint32_t _remoteSSRC GUARDED_BY(_criticalSectionRTCPReceiver);
278 std::set<uint32_t> registered_ssrcs_ GUARDED_BY(_criticalSectionRTCPReceiver); 279 std::set<uint32_t> registered_ssrcs_ GUARDED_BY(_criticalSectionRTCPReceiver);
279 280
280 // Received send report 281 // Received send report
281 RTCPSenderInfo _remoteSenderInfo; 282 RTCPSenderInfo _remoteSenderInfo;
282 // when did we receive the last send report 283 // when did we receive the last send report
283 uint32_t _lastReceivedSRNTPsecs; 284 uint32_t _lastReceivedSRNTPsecs;
284 uint32_t _lastReceivedSRNTPfrac; 285 uint32_t _lastReceivedSRNTPfrac;
285 286
(...skipping 24 matching lines...) Expand all
310 RtcpPacketTypeCounterObserver* const packet_type_counter_observer_; 311 RtcpPacketTypeCounterObserver* const packet_type_counter_observer_;
311 RtcpPacketTypeCounter packet_type_counter_; 312 RtcpPacketTypeCounter packet_type_counter_;
312 313
313 RTCPUtility::NackStats nack_stats_; 314 RTCPUtility::NackStats nack_stats_;
314 315
315 size_t num_skipped_packets_; 316 size_t num_skipped_packets_;
316 int64_t last_skipped_packets_warning_; 317 int64_t last_skipped_packets_warning_;
317 }; 318 };
318 } // namespace webrtc 319 } // namespace webrtc
319 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_H_ 320 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc ('k') | webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698