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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.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_RTP_RTCP_IMPL_H_ 11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_
12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_ 12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_
13 13
14 #include <list> 14 #include <list>
15 #include <set> 15 #include <set>
16 #include <utility> 16 #include <utility>
17 #include <vector> 17 #include <vector>
18 18
19 #include "webrtc/base/criticalsection.h"
19 #include "webrtc/base/gtest_prod_util.h" 20 #include "webrtc/base/gtest_prod_util.h"
20 #include "webrtc/base/scoped_ptr.h"
21 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" 21 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
22 #include "webrtc/modules/rtp_rtcp/source/packet_loss_stats.h" 22 #include "webrtc/modules/rtp_rtcp/source/packet_loss_stats.h"
23 #include "webrtc/modules/rtp_rtcp/source/rtcp_receiver.h" 23 #include "webrtc/modules/rtp_rtcp/source/rtcp_receiver.h"
24 #include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h" 24 #include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h"
25 #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" 25 #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h"
26 26
27 namespace webrtc { 27 namespace webrtc {
28 28
29 class ModuleRtpRtcpImpl : public RtpRtcp { 29 class ModuleRtpRtcpImpl : public RtpRtcp {
30 public: 30 public:
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 KeyFrameRequestMethod key_frame_req_method_; 355 KeyFrameRequestMethod key_frame_req_method_;
356 356
357 RemoteBitrateEstimator* remote_bitrate_; 357 RemoteBitrateEstimator* remote_bitrate_;
358 358
359 RtcpRttStats* rtt_stats_; 359 RtcpRttStats* rtt_stats_;
360 360
361 PacketLossStats send_loss_stats_; 361 PacketLossStats send_loss_stats_;
362 PacketLossStats receive_loss_stats_; 362 PacketLossStats receive_loss_stats_;
363 363
364 // The processed RTT from RtcpRttStats. 364 // The processed RTT from RtcpRttStats.
365 rtc::scoped_ptr<CriticalSectionWrapper> critical_section_rtt_; 365 rtc::CriticalSection critical_section_rtt_;
366 int64_t rtt_ms_; 366 int64_t rtt_ms_;
367 }; 367 };
368 368
369 } // namespace webrtc 369 } // namespace webrtc
370 370
371 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_ 371 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698