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

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

Issue 3010223002: Update thread annotiation macros in modules to use RTC_ prefix (Closed)
Patch Set: Created 3 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
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 89
90 // Send REMB feedback. 90 // Send REMB feedback.
91 virtual bool SendRemb(uint32_t bitrate_bps, 91 virtual bool SendRemb(uint32_t bitrate_bps,
92 const std::vector<uint32_t>& ssrcs); 92 const std::vector<uint32_t>& ssrcs);
93 93
94 // Send transport feedback packet to send-side. 94 // Send transport feedback packet to send-side.
95 virtual bool SendTransportFeedback(rtcp::TransportFeedback* packet); 95 virtual bool SendTransportFeedback(rtcp::TransportFeedback* packet);
96 96
97 private: 97 private:
98 void AddRembModuleCandidate(RtpRtcp* candidate_module, bool sender) 98 void AddRembModuleCandidate(RtpRtcp* candidate_module, bool sender)
99 EXCLUSIVE_LOCKS_REQUIRED(modules_crit_); 99 RTC_EXCLUSIVE_LOCKS_REQUIRED(modules_crit_);
100 void MaybeRemoveRembModuleCandidate(RtpRtcp* candidate_module, bool sender) 100 void MaybeRemoveRembModuleCandidate(RtpRtcp* candidate_module, bool sender)
101 EXCLUSIVE_LOCKS_REQUIRED(modules_crit_); 101 RTC_EXCLUSIVE_LOCKS_REQUIRED(modules_crit_);
102 void UnsetActiveRembModule() EXCLUSIVE_LOCKS_REQUIRED(modules_crit_); 102 void UnsetActiveRembModule() RTC_EXCLUSIVE_LOCKS_REQUIRED(modules_crit_);
103 void DetermineActiveRembModule() EXCLUSIVE_LOCKS_REQUIRED(modules_crit_); 103 void DetermineActiveRembModule() RTC_EXCLUSIVE_LOCKS_REQUIRED(modules_crit_);
104 104
105 rtc::RaceChecker pacer_race_; 105 rtc::RaceChecker pacer_race_;
106 rtc::CriticalSection modules_crit_; 106 rtc::CriticalSection modules_crit_;
107 std::list<RtpRtcp*> rtp_send_modules_ GUARDED_BY(modules_crit_); 107 std::list<RtpRtcp*> rtp_send_modules_ RTC_GUARDED_BY(modules_crit_);
108 std::vector<RtpRtcp*> rtp_receive_modules_ GUARDED_BY(modules_crit_); 108 std::vector<RtpRtcp*> rtp_receive_modules_ RTC_GUARDED_BY(modules_crit_);
109 109
110 // TODO(eladalon): remb_crit_ only ever held from one function, and it's not 110 // TODO(eladalon): remb_crit_ only ever held from one function, and it's not
111 // clear if that function can actually be called from more than one thread. 111 // clear if that function can actually be called from more than one thread.
112 rtc::CriticalSection remb_crit_; 112 rtc::CriticalSection remb_crit_;
113 // The last time a REMB was sent. 113 // The last time a REMB was sent.
114 int64_t last_remb_time_ms_ GUARDED_BY(remb_crit_); 114 int64_t last_remb_time_ms_ RTC_GUARDED_BY(remb_crit_);
115 uint32_t last_send_bitrate_bps_ GUARDED_BY(remb_crit_); 115 uint32_t last_send_bitrate_bps_ RTC_GUARDED_BY(remb_crit_);
116 // The last bitrate update. 116 // The last bitrate update.
117 uint32_t bitrate_bps_ GUARDED_BY(remb_crit_); 117 uint32_t bitrate_bps_ RTC_GUARDED_BY(remb_crit_);
118 uint32_t max_bitrate_bps_ GUARDED_BY(remb_crit_); 118 uint32_t max_bitrate_bps_ RTC_GUARDED_BY(remb_crit_);
119 119
120 // Candidates for the REMB module can be RTP sender/receiver modules, with 120 // Candidates for the REMB module can be RTP sender/receiver modules, with
121 // the sender modules taking precedence. 121 // the sender modules taking precedence.
122 std::vector<RtpRtcp*> sender_remb_candidates_ GUARDED_BY(modules_crit_); 122 std::vector<RtpRtcp*> sender_remb_candidates_ RTC_GUARDED_BY(modules_crit_);
123 std::vector<RtpRtcp*> receiver_remb_candidates_ GUARDED_BY(modules_crit_); 123 std::vector<RtpRtcp*> receiver_remb_candidates_ RTC_GUARDED_BY(modules_crit_);
124 RtpRtcp* active_remb_module_ GUARDED_BY(modules_crit_); 124 RtpRtcp* active_remb_module_ RTC_GUARDED_BY(modules_crit_);
125 125
126 volatile int transport_seq_; 126 volatile int transport_seq_;
127 127
128 RTC_DISALLOW_COPY_AND_ASSIGN(PacketRouter); 128 RTC_DISALLOW_COPY_AND_ASSIGN(PacketRouter);
129 }; 129 };
130 } // namespace webrtc 130 } // namespace webrtc
131 #endif // WEBRTC_MODULES_PACING_PACKET_ROUTER_H_ 131 #endif // WEBRTC_MODULES_PACING_PACKET_ROUTER_H_
OLDNEW
« no previous file with comments | « webrtc/modules/pacing/paced_sender.h ('k') | webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698