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

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

Issue 1208843003: Removed extended jitter report from RtcpSender (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Addressed comments Created 5 years, 5 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
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 void SetREMBStatus(bool enable); 127 void SetREMBStatus(bool enable);
128 128
129 void SetREMBData(uint32_t bitrate, const std::vector<uint32_t>& ssrcs); 129 void SetREMBData(uint32_t bitrate, const std::vector<uint32_t>& ssrcs);
130 130
131 bool TMMBR() const; 131 bool TMMBR() const;
132 132
133 void SetTMMBRStatus(bool enable); 133 void SetTMMBRStatus(bool enable);
134 134
135 int32_t SetTMMBN(const TMMBRSet* boundingSet, uint32_t maxBitrateKbit); 135 int32_t SetTMMBN(const TMMBRSet* boundingSet, uint32_t maxBitrateKbit);
136 136
137 // Extended jitter report
138 bool IJ() const;
139
140 void SetIJStatus(bool enable);
141
142 int32_t SetApplicationSpecificData(uint8_t subType, 137 int32_t SetApplicationSpecificData(uint8_t subType,
143 uint32_t name, 138 uint32_t name,
144 const uint8_t* data, 139 const uint8_t* data,
145 uint16_t length); 140 uint16_t length);
146 int32_t SetRTCPVoIPMetrics(const RTCPVoIPMetric* VoIPMetric); 141 int32_t SetRTCPVoIPMetrics(const RTCPVoIPMetric* VoIPMetric);
147 142
148 void SendRtcpXrReceiverReferenceTime(bool enable); 143 void SendRtcpXrReceiverReferenceTime(bool enable);
149 144
150 bool RtcpXrReceiverReferenceTime() const; 145 bool RtcpXrReceiverReferenceTime() const;
151 146
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 const uint16_t* nackList, 186 const uint16_t* nackList,
192 bool repeat, 187 bool repeat,
193 uint64_t pictureID, 188 uint64_t pictureID,
194 uint8_t* rtcp_buffer, 189 uint8_t* rtcp_buffer,
195 int buffer_size); 190 int buffer_size);
196 191
197 BuildResult BuildSR(RtcpContext* context) 192 BuildResult BuildSR(RtcpContext* context)
198 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); 193 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
199 BuildResult BuildRR(RtcpContext* context) 194 BuildResult BuildRR(RtcpContext* context)
200 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); 195 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
201 BuildResult BuildExtendedJitterReport(RtcpContext* context)
202 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
203 BuildResult BuildSDES(RtcpContext* context) 196 BuildResult BuildSDES(RtcpContext* context)
204 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); 197 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
205 BuildResult BuildPLI(RtcpContext* context) 198 BuildResult BuildPLI(RtcpContext* context)
206 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); 199 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
207 BuildResult BuildREMB(RtcpContext* context) 200 BuildResult BuildREMB(RtcpContext* context)
208 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); 201 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
209 BuildResult BuildTMMBR(RtcpContext* context) 202 BuildResult BuildTMMBR(RtcpContext* context)
210 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); 203 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
211 BuildResult BuildTMMBN(RtcpContext* context) 204 BuildResult BuildTMMBN(RtcpContext* context)
212 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); 205 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
(...skipping 22 matching lines...) Expand all
235 Clock* const clock_; 228 Clock* const clock_;
236 RTCPMethod method_ GUARDED_BY(critical_section_rtcp_sender_); 229 RTCPMethod method_ GUARDED_BY(critical_section_rtcp_sender_);
237 230
238 rtc::scoped_ptr<CriticalSectionWrapper> critical_section_transport_; 231 rtc::scoped_ptr<CriticalSectionWrapper> critical_section_transport_;
239 Transport* cbTransport_ GUARDED_BY(critical_section_transport_); 232 Transport* cbTransport_ GUARDED_BY(critical_section_transport_);
240 233
241 rtc::scoped_ptr<CriticalSectionWrapper> critical_section_rtcp_sender_; 234 rtc::scoped_ptr<CriticalSectionWrapper> critical_section_rtcp_sender_;
242 bool using_nack_ GUARDED_BY(critical_section_rtcp_sender_); 235 bool using_nack_ GUARDED_BY(critical_section_rtcp_sender_);
243 bool sending_ GUARDED_BY(critical_section_rtcp_sender_); 236 bool sending_ GUARDED_BY(critical_section_rtcp_sender_);
244 bool remb_enabled_ GUARDED_BY(critical_section_rtcp_sender_); 237 bool remb_enabled_ GUARDED_BY(critical_section_rtcp_sender_);
245 bool extended_jitter_report_enabled_ GUARDED_BY(critical_section_rtcp_sender_);
246 238
247 int64_t next_time_to_send_rtcp_ GUARDED_BY(critical_section_rtcp_sender_); 239 int64_t next_time_to_send_rtcp_ GUARDED_BY(critical_section_rtcp_sender_);
248 240
249 uint32_t start_timestamp_ GUARDED_BY(critical_section_rtcp_sender_); 241 uint32_t start_timestamp_ GUARDED_BY(critical_section_rtcp_sender_);
250 uint32_t last_rtp_timestamp_ GUARDED_BY(critical_section_rtcp_sender_); 242 uint32_t last_rtp_timestamp_ GUARDED_BY(critical_section_rtcp_sender_);
251 int64_t last_frame_capture_time_ms_ GUARDED_BY(critical_section_rtcp_sender_); 243 int64_t last_frame_capture_time_ms_ GUARDED_BY(critical_section_rtcp_sender_);
252 uint32_t ssrc_ GUARDED_BY(critical_section_rtcp_sender_); 244 uint32_t ssrc_ GUARDED_BY(critical_section_rtcp_sender_);
253 // SSRC that we receive on our RTP channel 245 // SSRC that we receive on our RTP channel
254 uint32_t remote_ssrc_ GUARDED_BY(critical_section_rtcp_sender_); 246 uint32_t remote_ssrc_ GUARDED_BY(critical_section_rtcp_sender_);
255 std::string cname_ GUARDED_BY(critical_section_rtcp_sender_); 247 std::string cname_ GUARDED_BY(critical_section_rtcp_sender_);
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 std::set<ReportFlag> report_flags_ GUARDED_BY(critical_section_rtcp_sender_); 319 std::set<ReportFlag> report_flags_ GUARDED_BY(critical_section_rtcp_sender_);
328 320
329 typedef BuildResult (RTCPSender::*Builder)(RtcpContext*); 321 typedef BuildResult (RTCPSender::*Builder)(RtcpContext*);
330 std::map<RTCPPacketType, Builder> builders_; 322 std::map<RTCPPacketType, Builder> builders_;
331 323
332 class PacketBuiltCallback; 324 class PacketBuiltCallback;
333 }; 325 };
334 } // namespace webrtc 326 } // namespace webrtc
335 327
336 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_SENDER_H_ 328 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_SENDER_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc ('k') | webrtc/modules/rtp_rtcp/source/rtcp_sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698