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

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

Issue 2248413002: Revert 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
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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 int SendPayloadFrequency() const; 83 int SendPayloadFrequency() const;
84 84
85 void SetSendingStatus(bool enabled); 85 void SetSendingStatus(bool enabled);
86 86
87 void SetSendingMediaStatus(bool enabled); 87 void SetSendingMediaStatus(bool enabled);
88 bool SendingMedia() const; 88 bool SendingMedia() const;
89 89
90 void GetDataCounters(StreamDataCounters* rtp_stats, 90 void GetDataCounters(StreamDataCounters* rtp_stats,
91 StreamDataCounters* rtx_stats) const; 91 StreamDataCounters* rtx_stats) const;
92 92
93 uint32_t TimestampOffset() const; 93 uint32_t StartTimestamp() const;
94 void SetTimestampOffset(uint32_t timestamp); 94 void SetStartTimestamp(uint32_t timestamp, bool force);
95 95
96 uint32_t GenerateNewSSRC(); 96 uint32_t GenerateNewSSRC();
97 void SetSSRC(uint32_t ssrc); 97 void SetSSRC(uint32_t ssrc);
98 98
99 uint16_t SequenceNumber() const; 99 uint16_t SequenceNumber() const;
100 void SetSequenceNumber(uint16_t seq); 100 void SetSequenceNumber(uint16_t seq);
101 101
102 void SetCsrcs(const std::vector<uint32_t>& csrcs); 102 void SetCsrcs(const std::vector<uint32_t>& csrcs);
103 103
104 void SetMaxPayloadLength(size_t max_payload_length); 104 void SetMaxPayloadLength(size_t max_payload_length);
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 StreamDataCountersCallback* rtp_stats_callback_ GUARDED_BY(statistics_crit_); 401 StreamDataCountersCallback* rtp_stats_callback_ GUARDED_BY(statistics_crit_);
402 RateStatistics total_bitrate_sent_ GUARDED_BY(statistics_crit_); 402 RateStatistics total_bitrate_sent_ GUARDED_BY(statistics_crit_);
403 RateStatistics nack_bitrate_sent_ GUARDED_BY(statistics_crit_); 403 RateStatistics nack_bitrate_sent_ GUARDED_BY(statistics_crit_);
404 FrameCountObserver* const frame_count_observer_; 404 FrameCountObserver* const frame_count_observer_;
405 SendSideDelayObserver* const send_side_delay_observer_; 405 SendSideDelayObserver* const send_side_delay_observer_;
406 RtcEventLog* const event_log_; 406 RtcEventLog* const event_log_;
407 SendPacketObserver* const send_packet_observer_; 407 SendPacketObserver* const send_packet_observer_;
408 BitrateStatisticsObserver* const bitrate_callback_; 408 BitrateStatisticsObserver* const bitrate_callback_;
409 409
410 // RTP variables 410 // RTP variables
411 uint32_t timestamp_offset_ GUARDED_BY(send_critsect_); 411 bool start_timestamp_forced_ GUARDED_BY(send_critsect_);
412 uint32_t start_timestamp_ GUARDED_BY(send_critsect_);
412 SSRCDatabase* const ssrc_db_; 413 SSRCDatabase* const ssrc_db_;
413 uint32_t remote_ssrc_ GUARDED_BY(send_critsect_); 414 uint32_t remote_ssrc_ GUARDED_BY(send_critsect_);
414 bool sequence_number_forced_ GUARDED_BY(send_critsect_); 415 bool sequence_number_forced_ GUARDED_BY(send_critsect_);
415 uint16_t sequence_number_ GUARDED_BY(send_critsect_); 416 uint16_t sequence_number_ GUARDED_BY(send_critsect_);
416 uint16_t sequence_number_rtx_ GUARDED_BY(send_critsect_); 417 uint16_t sequence_number_rtx_ GUARDED_BY(send_critsect_);
417 bool ssrc_forced_ GUARDED_BY(send_critsect_); 418 bool ssrc_forced_ GUARDED_BY(send_critsect_);
418 uint32_t ssrc_ GUARDED_BY(send_critsect_); 419 uint32_t ssrc_ GUARDED_BY(send_critsect_);
419 uint32_t timestamp_ GUARDED_BY(send_critsect_); 420 uint32_t timestamp_ GUARDED_BY(send_critsect_);
420 int64_t capture_time_ms_ GUARDED_BY(send_critsect_); 421 int64_t capture_time_ms_ GUARDED_BY(send_critsect_);
421 int64_t last_timestamp_time_ms_ GUARDED_BY(send_critsect_); 422 int64_t last_timestamp_time_ms_ GUARDED_BY(send_critsect_);
422 bool media_has_been_sent_ GUARDED_BY(send_critsect_); 423 bool media_has_been_sent_ GUARDED_BY(send_critsect_);
423 bool last_packet_marker_bit_ GUARDED_BY(send_critsect_); 424 bool last_packet_marker_bit_ GUARDED_BY(send_critsect_);
424 std::vector<uint32_t> csrcs_ GUARDED_BY(send_critsect_); 425 std::vector<uint32_t> csrcs_ GUARDED_BY(send_critsect_);
425 int rtx_ GUARDED_BY(send_critsect_); 426 int rtx_ GUARDED_BY(send_critsect_);
426 uint32_t ssrc_rtx_ GUARDED_BY(send_critsect_); 427 uint32_t ssrc_rtx_ GUARDED_BY(send_critsect_);
427 // Mapping rtx_payload_type_map_[associated] = rtx. 428 // Mapping rtx_payload_type_map_[associated] = rtx.
428 std::map<int8_t, int8_t> rtx_payload_type_map_ GUARDED_BY(send_critsect_); 429 std::map<int8_t, int8_t> rtx_payload_type_map_ GUARDED_BY(send_critsect_);
429 430
430 RateLimiter* const retransmission_rate_limiter_; 431 RateLimiter* const retransmission_rate_limiter_;
431 432
432 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RTPSender); 433 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RTPSender);
433 }; 434 };
434 435
435 } // namespace webrtc 436 } // namespace webrtc
436 437
437 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_ 438 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698