Chromium Code Reviews| Index: webrtc/modules/bitrate_controller/bitrate_controller_impl.cc |
| diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc b/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc |
| index 1231c782a9b0048f846a708d47d239dcc9557330..ec54c568cd9e5e95ef9a722a04fb775a72c328e8 100644 |
| --- a/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc |
| +++ b/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc |
| @@ -31,7 +31,7 @@ class BitrateControllerImpl::RtcpBandwidthObserverImpl |
| } |
| // Received RTCP REMB or TMMBR. |
| void OnReceivedEstimatedBitrate(uint32_t bitrate) override { |
| - owner_->OnReceivedEstimatedBitrate(bitrate); |
| + owner_->OnReceiverEstimatedBitrate(bitrate); |
| } |
| // Received RTCP receiver block. |
| void OnReceivedRtcpReceiverReport(const ReportBlockList& report_blocks, |
| @@ -173,7 +173,8 @@ void BitrateControllerImpl::SetReservedBitrate(uint32_t reserved_bitrate_bps) { |
| MaybeTriggerOnNetworkChanged(); |
| } |
| -void BitrateControllerImpl::OnReceivedEstimatedBitrate(uint32_t bitrate) { |
| +// This is called upon reception of REMB or TMMBR. |
| +void BitrateControllerImpl::OnReceiverEstimatedBitrate(uint32_t bitrate) { |
| { |
| rtc::CritScope cs(&critsect_); |
| bandwidth_estimation_.UpdateReceiverEstimate(clock_->TimeInMilliseconds(), |
| @@ -182,7 +183,7 @@ void BitrateControllerImpl::OnReceivedEstimatedBitrate(uint32_t bitrate) { |
| MaybeTriggerOnNetworkChanged(); |
| } |
| -void BitrateControllerImpl::UpdateProbeBitrate(uint32_t bitrate_bps) { |
| +void BitrateControllerImpl::OnProbeBitrate(uint32_t bitrate_bps) { |
| { |
| rtc::CritScope cs(&critsect_); |
| bandwidth_estimation_.SetSendBitrate(bitrate_bps); |
| @@ -190,7 +191,10 @@ void BitrateControllerImpl::UpdateProbeBitrate(uint32_t bitrate_bps) { |
| MaybeTriggerOnNetworkChanged(); |
| } |
| -void BitrateControllerImpl::UpdateDelayBasedEstimate(uint32_t bitrate_bps) { |
| +// This is called for BW estimate from a send-side estimator. |
|
stefan-webrtc
2016/09/12 13:58:29
Perhaps make this a TODO and mention that we shoul
Irfan
2016/09/12 14:22:18
Done.
|
| +void BitrateControllerImpl::OnReceiveBitrateChanged( |
| + const std::vector<uint32_t>& ssrcs, |
| + uint32_t bitrate_bps) { |
| { |
| rtc::CritScope cs(&critsect_); |
| bandwidth_estimation_.UpdateDelayBasedEstimate(clock_->TimeInMilliseconds(), |