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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 | 46 |
47 void IncomingPacket(int64_t arrival_time_ms, | 47 void IncomingPacket(int64_t arrival_time_ms, |
48 size_t payload_size, | 48 size_t payload_size, |
49 const RTPHeader& header, | 49 const RTPHeader& header, |
50 bool was_paced) override { | 50 bool was_paced) override { |
51 CriticalSectionScoped cs(crit_sect_.get()); | 51 CriticalSectionScoped cs(crit_sect_.get()); |
52 PickEstimatorFromHeader(header); | 52 PickEstimatorFromHeader(header); |
53 rbe_->IncomingPacket(arrival_time_ms, payload_size, header, was_paced); | 53 rbe_->IncomingPacket(arrival_time_ms, payload_size, header, was_paced); |
54 } | 54 } |
55 | 55 |
56 void Process() override { | 56 int32_t Process() override { |
57 CriticalSectionScoped cs(crit_sect_.get()); | 57 CriticalSectionScoped cs(crit_sect_.get()); |
58 rbe_->Process(); | 58 return rbe_->Process(); |
59 } | 59 } |
60 | 60 |
61 int64_t TimeUntilNextProcess() override { | 61 int64_t TimeUntilNextProcess() override { |
62 CriticalSectionScoped cs(crit_sect_.get()); | 62 CriticalSectionScoped cs(crit_sect_.get()); |
63 return rbe_->TimeUntilNextProcess(); | 63 return rbe_->TimeUntilNextProcess(); |
64 } | 64 } |
65 | 65 |
66 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override { | 66 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override { |
67 CriticalSectionScoped cs(crit_sect_.get()); | 67 CriticalSectionScoped cs(crit_sect_.get()); |
68 rbe_->OnRttUpdate(avg_rtt_ms, max_rtt_ms); | 68 rbe_->OnRttUpdate(avg_rtt_ms, max_rtt_ms); |
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
234 void CongestionController::OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) { | 234 void CongestionController::OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) { |
235 remote_bitrate_estimator_->OnRttUpdate(avg_rtt_ms, max_rtt_ms); | 235 remote_bitrate_estimator_->OnRttUpdate(avg_rtt_ms, max_rtt_ms); |
236 transport_feedback_adapter_.OnRttUpdate(avg_rtt_ms, max_rtt_ms); | 236 transport_feedback_adapter_.OnRttUpdate(avg_rtt_ms, max_rtt_ms); |
237 } | 237 } |
238 | 238 |
239 int64_t CongestionController::TimeUntilNextProcess() { | 239 int64_t CongestionController::TimeUntilNextProcess() { |
240 return std::min(bitrate_controller_->TimeUntilNextProcess(), | 240 return std::min(bitrate_controller_->TimeUntilNextProcess(), |
241 remote_bitrate_estimator_->TimeUntilNextProcess()); | 241 remote_bitrate_estimator_->TimeUntilNextProcess()); |
242 } | 242 } |
243 | 243 |
244 void CongestionController::Process() { | 244 int32_t CongestionController::Process() { |
245 bitrate_controller_->Process(); | 245 bitrate_controller_->Process(); |
246 remote_bitrate_estimator_->Process(); | 246 remote_bitrate_estimator_->Process(); |
| 247 return 0; |
247 } | 248 } |
248 | 249 |
249 } // namespace webrtc | 250 } // namespace webrtc |
OLD | NEW |