| Index: webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc
|
| diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc
|
| index 4b7732c80f8212a7b47155b8c611a6c64f863aa4..8bdb68a2d50e22088c808bbb20553db809554fcd 100644
|
| --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc
|
| +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc
|
| @@ -175,10 +175,10 @@ void RemoteBitrateEstimatorSingleStream::UpdateEstimate(int64_t now_ms) {
|
| incoming_bitrate_.Rate(now_ms),
|
| mean_noise_var);
|
| remote_rate_->Update(&input, now_ms);
|
| - unsigned int target_bitrate = remote_rate_->UpdateBandwidthEstimate(now_ms);
|
| + uint32_t target_bitrate = remote_rate_->UpdateBandwidthEstimate(now_ms);
|
| if (remote_rate_->ValidEstimate()) {
|
| process_interval_ms_ = remote_rate_->GetFeedbackInterval();
|
| - std::vector<unsigned int> ssrcs;
|
| + std::vector<uint32_t> ssrcs;
|
| GetSsrcs(&ssrcs);
|
| observer_->OnReceiveBitrateChanged(ssrcs, target_bitrate);
|
| }
|
| @@ -200,8 +200,8 @@ void RemoteBitrateEstimatorSingleStream::RemoveStream(unsigned int ssrc) {
|
| }
|
|
|
| bool RemoteBitrateEstimatorSingleStream::LatestEstimate(
|
| - std::vector<unsigned int>* ssrcs,
|
| - unsigned int* bitrate_bps) const {
|
| + std::vector<uint32_t>* ssrcs,
|
| + uint32_t* bitrate_bps) const {
|
| CriticalSectionScoped cs(crit_sect_.get());
|
| assert(bitrate_bps);
|
| if (!remote_rate_->ValidEstimate()) {
|
| @@ -222,7 +222,7 @@ bool RemoteBitrateEstimatorSingleStream::GetStats(
|
| }
|
|
|
| void RemoteBitrateEstimatorSingleStream::GetSsrcs(
|
| - std::vector<unsigned int>* ssrcs) const {
|
| + std::vector<uint32_t>* ssrcs) const {
|
| assert(ssrcs);
|
| ssrcs->resize(overuse_detectors_.size());
|
| int i = 0;
|
|
|