| Index: webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
|
| diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
|
| index f02a1c4a4b055fe2a69662ebf051537bae60fec8..23da9cac9586304c2de204a3916dbeaba62f4684 100644
|
| --- a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
|
| +++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
|
| @@ -161,7 +161,7 @@
|
| sending_(false),
|
| remb_enabled_(false),
|
| next_time_to_send_rtcp_(0),
|
| - timestamp_offset_(0),
|
| + start_timestamp_(0),
|
| last_rtp_timestamp_(0),
|
| last_frame_capture_time_ms_(-1),
|
| ssrc_(0),
|
| @@ -288,9 +288,9 @@
|
| max_payload_length_ = max_payload_length;
|
| }
|
|
|
| -void RTCPSender::SetTimestampOffset(uint32_t timestamp_offset) {
|
| - rtc::CritScope lock(&critical_section_rtcp_sender_);
|
| - timestamp_offset_ = timestamp_offset;
|
| +void RTCPSender::SetStartTimestamp(uint32_t start_timestamp) {
|
| + rtc::CritScope lock(&critical_section_rtcp_sender_);
|
| + start_timestamp_ = start_timestamp;
|
| }
|
|
|
| void RTCPSender::SetLastRtpTime(uint32_t rtp_timestamp,
|
| @@ -444,7 +444,7 @@
|
| // timestamp as the last frame's timestamp + the time since the last frame
|
| // was captured.
|
| uint32_t rtp_timestamp =
|
| - timestamp_offset_ + last_rtp_timestamp_ +
|
| + start_timestamp_ + last_rtp_timestamp_ +
|
| (clock_->TimeInMilliseconds() - last_frame_capture_time_ms_) *
|
| (ctx.feedback_state_.frequency_hz / 1000);
|
|
|
|
|