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

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

Issue 2257083002: Reland of StartTimestamp generated randomly in RtpSender constructor (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 4 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
« no previous file with comments | « no previous file | webrtc/modules/rtp_rtcp/source/rtcp_sender.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 86
87 RtcpMode Status() const; 87 RtcpMode Status() const;
88 void SetRTCPStatus(RtcpMode method); 88 void SetRTCPStatus(RtcpMode method);
89 89
90 bool Sending() const; 90 bool Sending() const;
91 int32_t SetSendingStatus(const FeedbackState& feedback_state, 91 int32_t SetSendingStatus(const FeedbackState& feedback_state,
92 bool enabled); // combine the functions 92 bool enabled); // combine the functions
93 93
94 int32_t SetNackStatus(bool enable); 94 int32_t SetNackStatus(bool enable);
95 95
96 void SetStartTimestamp(uint32_t start_timestamp); 96 void SetTimestampOffset(uint32_t timestamp_offset);
97 97
98 void SetLastRtpTime(uint32_t rtp_timestamp, int64_t capture_time_ms); 98 void SetLastRtpTime(uint32_t rtp_timestamp, int64_t capture_time_ms);
99 99
100 void SetSSRC(uint32_t ssrc); 100 void SetSSRC(uint32_t ssrc);
101 101
102 void SetRemoteSSRC(uint32_t ssrc); 102 void SetRemoteSSRC(uint32_t ssrc);
103 103
104 int32_t SetCNAME(const char* cName); 104 int32_t SetCNAME(const char* cName);
105 105
106 int32_t AddMixedCNAME(uint32_t SSRC, const char* c_name); 106 int32_t AddMixedCNAME(uint32_t SSRC, const char* c_name);
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 RtcEventLog* const event_log_; 207 RtcEventLog* const event_log_;
208 Transport* const transport_; 208 Transport* const transport_;
209 209
210 rtc::CriticalSection critical_section_rtcp_sender_; 210 rtc::CriticalSection critical_section_rtcp_sender_;
211 bool using_nack_ GUARDED_BY(critical_section_rtcp_sender_); 211 bool using_nack_ GUARDED_BY(critical_section_rtcp_sender_);
212 bool sending_ GUARDED_BY(critical_section_rtcp_sender_); 212 bool sending_ GUARDED_BY(critical_section_rtcp_sender_);
213 bool remb_enabled_ GUARDED_BY(critical_section_rtcp_sender_); 213 bool remb_enabled_ GUARDED_BY(critical_section_rtcp_sender_);
214 214
215 int64_t next_time_to_send_rtcp_ GUARDED_BY(critical_section_rtcp_sender_); 215 int64_t next_time_to_send_rtcp_ GUARDED_BY(critical_section_rtcp_sender_);
216 216
217 uint32_t start_timestamp_ GUARDED_BY(critical_section_rtcp_sender_); 217 uint32_t timestamp_offset_ GUARDED_BY(critical_section_rtcp_sender_);
218 uint32_t last_rtp_timestamp_ GUARDED_BY(critical_section_rtcp_sender_); 218 uint32_t last_rtp_timestamp_ GUARDED_BY(critical_section_rtcp_sender_);
219 int64_t last_frame_capture_time_ms_ GUARDED_BY(critical_section_rtcp_sender_); 219 int64_t last_frame_capture_time_ms_ GUARDED_BY(critical_section_rtcp_sender_);
220 uint32_t ssrc_ GUARDED_BY(critical_section_rtcp_sender_); 220 uint32_t ssrc_ GUARDED_BY(critical_section_rtcp_sender_);
221 // SSRC that we receive on our RTP channel 221 // SSRC that we receive on our RTP channel
222 uint32_t remote_ssrc_ GUARDED_BY(critical_section_rtcp_sender_); 222 uint32_t remote_ssrc_ GUARDED_BY(critical_section_rtcp_sender_);
223 std::string cname_ GUARDED_BY(critical_section_rtcp_sender_); 223 std::string cname_ GUARDED_BY(critical_section_rtcp_sender_);
224 224
225 ReceiveStatistics* receive_statistics_ 225 ReceiveStatistics* receive_statistics_
226 GUARDED_BY(critical_section_rtcp_sender_); 226 GUARDED_BY(critical_section_rtcp_sender_);
227 std::map<uint32_t, rtcp::ReportBlock> report_blocks_ 227 std::map<uint32_t, rtcp::ReportBlock> report_blocks_
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 288
289 typedef std::unique_ptr<rtcp::RtcpPacket> (RTCPSender::*BuilderFunc)( 289 typedef std::unique_ptr<rtcp::RtcpPacket> (RTCPSender::*BuilderFunc)(
290 const RtcpContext&); 290 const RtcpContext&);
291 std::map<RTCPPacketType, BuilderFunc> builders_; 291 std::map<RTCPPacketType, BuilderFunc> builders_;
292 292
293 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RTCPSender); 293 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RTCPSender);
294 }; 294 };
295 } // namespace webrtc 295 } // namespace webrtc
296 296
297 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_SENDER_H_ 297 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_SENDER_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/rtp_rtcp/source/rtcp_sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698