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

Side by Side Diff: webrtc/modules/pacing/packet_router.cc

Issue 1335923002: Add RTC_ prefix to (D)CHECKs and related macros. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 5 years, 3 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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 #include "webrtc/modules/pacing/include/packet_router.h" 11 #include "webrtc/modules/pacing/include/packet_router.h"
12 12
13 #include "webrtc/base/atomicops.h" 13 #include "webrtc/base/atomicops.h"
14 #include "webrtc/base/checks.h" 14 #include "webrtc/base/checks.h"
15 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" 15 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h"
16 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" 16 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
17 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" 17 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
18 18
19 namespace webrtc { 19 namespace webrtc {
20 20
21 PacketRouter::PacketRouter() : transport_seq_(0) { 21 PacketRouter::PacketRouter() : transport_seq_(0) {
22 } 22 }
23 23
24 PacketRouter::~PacketRouter() { 24 PacketRouter::~PacketRouter() {
25 DCHECK(rtp_modules_.empty()); 25 RTC_DCHECK(rtp_modules_.empty());
26 } 26 }
27 27
28 void PacketRouter::AddRtpModule(RtpRtcp* rtp_module) { 28 void PacketRouter::AddRtpModule(RtpRtcp* rtp_module) {
29 rtc::CritScope cs(&modules_lock_); 29 rtc::CritScope cs(&modules_lock_);
30 DCHECK(std::find(rtp_modules_.begin(), rtp_modules_.end(), rtp_module) == 30 RTC_DCHECK(std::find(rtp_modules_.begin(), rtp_modules_.end(), rtp_module) ==
31 rtp_modules_.end()); 31 rtp_modules_.end());
32 rtp_modules_.push_back(rtp_module); 32 rtp_modules_.push_back(rtp_module);
33 } 33 }
34 34
35 void PacketRouter::RemoveRtpModule(RtpRtcp* rtp_module) { 35 void PacketRouter::RemoveRtpModule(RtpRtcp* rtp_module) {
36 rtc::CritScope cs(&modules_lock_); 36 rtc::CritScope cs(&modules_lock_);
37 auto it = std::find(rtp_modules_.begin(), rtp_modules_.end(), rtp_module); 37 auto it = std::find(rtp_modules_.begin(), rtp_modules_.end(), rtp_module);
38 DCHECK(it != rtp_modules_.end()); 38 RTC_DCHECK(it != rtp_modules_.end());
39 rtp_modules_.erase(it); 39 rtp_modules_.erase(it);
40 } 40 }
41 41
42 bool PacketRouter::TimeToSendPacket(uint32_t ssrc, 42 bool PacketRouter::TimeToSendPacket(uint32_t ssrc,
43 uint16_t sequence_number, 43 uint16_t sequence_number,
44 int64_t capture_timestamp, 44 int64_t capture_timestamp,
45 bool retransmission) { 45 bool retransmission) {
46 rtc::CritScope cs(&modules_lock_); 46 rtc::CritScope cs(&modules_lock_);
47 for (auto* rtp_module : rtp_modules_) { 47 for (auto* rtp_module : rtp_modules_) {
48 if (rtp_module->SendingMedia() && ssrc == rtp_module->SSRC()) { 48 if (rtp_module->SendingMedia() && ssrc == rtp_module->SSRC()) {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 rtc::CritScope cs(&modules_lock_); 94 rtc::CritScope cs(&modules_lock_);
95 for (auto* rtp_module : rtp_modules_) { 95 for (auto* rtp_module : rtp_modules_) {
96 packet->WithPacketSenderSsrc(rtp_module->SSRC()); 96 packet->WithPacketSenderSsrc(rtp_module->SSRC());
97 if (rtp_module->SendFeedbackPacket(*packet)) 97 if (rtp_module->SendFeedbackPacket(*packet))
98 return true; 98 return true;
99 } 99 }
100 return false; 100 return false;
101 } 101 }
102 102
103 } // namespace webrtc 103 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/desktop_capture/screen_capturer_x11.cc ('k') | webrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698