| OLD | NEW |
| 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 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 // Make sure we have a valid RTT before setting. | 204 // Make sure we have a valid RTT before setting. |
| 205 int64_t last_rtt = rtt_stats_->LastProcessedRtt(); | 205 int64_t last_rtt = rtt_stats_->LastProcessedRtt(); |
| 206 if (last_rtt >= 0) | 206 if (last_rtt >= 0) |
| 207 set_rtt_ms(last_rtt); | 207 set_rtt_ms(last_rtt); |
| 208 } | 208 } |
| 209 } | 209 } |
| 210 | 210 |
| 211 if (rtcp_sender_.TimeToSendRTCPReport()) | 211 if (rtcp_sender_.TimeToSendRTCPReport()) |
| 212 rtcp_sender_.SendRTCP(GetFeedbackState(), kRtcpReport); | 212 rtcp_sender_.SendRTCP(GetFeedbackState(), kRtcpReport); |
| 213 | 213 |
| 214 if (TMMBR() && rtcp_receiver_.UpdateRTCPReceiveInformationTimers()) { | 214 if (TMMBR() && rtcp_receiver_.UpdateTmmbrTimers()) { |
| 215 // A receiver has timed out. | 215 rtcp_receiver_.NotifyTmmbrUpdated(); |
| 216 rtcp_receiver_.UpdateTmmbr(); | |
| 217 } | 216 } |
| 218 } | 217 } |
| 219 | 218 |
| 220 void ModuleRtpRtcpImpl::SetRtxSendStatus(int mode) { | 219 void ModuleRtpRtcpImpl::SetRtxSendStatus(int mode) { |
| 221 rtp_sender_.SetRtxStatus(mode); | 220 rtp_sender_.SetRtxStatus(mode); |
| 222 } | 221 } |
| 223 | 222 |
| 224 int ModuleRtpRtcpImpl::RtxSendStatus() const { | 223 int ModuleRtpRtcpImpl::RtxSendStatus() const { |
| 225 return rtp_sender_.RtxStatus(); | 224 return rtp_sender_.RtxStatus(); |
| 226 } | 225 } |
| (...skipping 686 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 913 StreamDataCountersCallback* | 912 StreamDataCountersCallback* |
| 914 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const { | 913 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const { |
| 915 return rtp_sender_.GetRtpStatisticsCallback(); | 914 return rtp_sender_.GetRtpStatisticsCallback(); |
| 916 } | 915 } |
| 917 | 916 |
| 918 void ModuleRtpRtcpImpl::SetVideoBitrateAllocation( | 917 void ModuleRtpRtcpImpl::SetVideoBitrateAllocation( |
| 919 const BitrateAllocation& bitrate) { | 918 const BitrateAllocation& bitrate) { |
| 920 rtcp_sender_.SetVideoBitrateAllocation(bitrate); | 919 rtcp_sender_.SetVideoBitrateAllocation(bitrate); |
| 921 } | 920 } |
| 922 } // namespace webrtc | 921 } // namespace webrtc |
| OLD | NEW |