OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2016 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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 result.updated = UpdateEstimate(info.arrival_time_ms, now_ms, | 122 result.updated = UpdateEstimate(info.arrival_time_ms, now_ms, |
123 &result.target_bitrate_bps); | 123 &result.target_bitrate_bps); |
124 } | 124 } |
125 } else if (probing_bps > 0) { | 125 } else if (probing_bps > 0) { |
126 // No overuse, but probing measured a bitrate. | 126 // No overuse, but probing measured a bitrate. |
127 rate_control_.SetEstimate(probing_bps, info.arrival_time_ms); | 127 rate_control_.SetEstimate(probing_bps, info.arrival_time_ms); |
128 result.probe = true; | 128 result.probe = true; |
129 result.updated = UpdateEstimate(info.arrival_time_ms, now_ms, | 129 result.updated = UpdateEstimate(info.arrival_time_ms, now_ms, |
130 &result.target_bitrate_bps); | 130 &result.target_bitrate_bps); |
131 } | 131 } |
132 rtc::Optional<uint32_t> incoming_rate = | |
133 receiver_incoming_bitrate_.Rate(info.arrival_time_ms); | |
134 if (!result.updated && | 132 if (!result.updated && |
135 (last_update_ms_ == -1 || | 133 (last_update_ms_ == -1 || |
136 now_ms - last_update_ms_ > rate_control_.GetFeedbackInterval())) { | 134 now_ms - last_update_ms_ > rate_control_.GetFeedbackInterval())) { |
137 result.updated = UpdateEstimate(info.arrival_time_ms, now_ms, | 135 result.updated = UpdateEstimate(info.arrival_time_ms, now_ms, |
138 &result.target_bitrate_bps); | 136 &result.target_bitrate_bps); |
139 } | 137 } |
140 if (result.updated) | 138 if (result.updated) |
141 last_update_ms_ = now_ms; | 139 last_update_ms_ = now_ms; |
142 | 140 |
143 return result; | 141 return result; |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
176 *bitrate_bps = rate_control_.LatestEstimate(); | 174 *bitrate_bps = rate_control_.LatestEstimate(); |
177 return true; | 175 return true; |
178 } | 176 } |
179 | 177 |
180 void DelayBasedBwe::SetMinBitrate(int min_bitrate_bps) { | 178 void DelayBasedBwe::SetMinBitrate(int min_bitrate_bps) { |
181 // Called from both the configuration thread and the network thread. Shouldn't | 179 // Called from both the configuration thread and the network thread. Shouldn't |
182 // be called from the network thread in the future. | 180 // be called from the network thread in the future. |
183 rate_control_.SetMinBitrate(min_bitrate_bps); | 181 rate_control_.SetMinBitrate(min_bitrate_bps); |
184 } | 182 } |
185 } // namespace webrtc | 183 } // namespace webrtc |
OLD | NEW |