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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 | 70 |
71 private: | 71 private: |
72 float UpdateWindow(int64_t now_ms, int bytes, int rate_window_ms); | 72 float UpdateWindow(int64_t now_ms, int bytes, int rate_window_ms); |
73 int sum_; | 73 int sum_; |
74 int64_t current_win_ms_; | 74 int64_t current_win_ms_; |
75 int64_t prev_time_ms_; | 75 int64_t prev_time_ms_; |
76 float bitrate_estimate_; | 76 float bitrate_estimate_; |
77 float bitrate_estimate_var_; | 77 float bitrate_estimate_var_; |
78 }; | 78 }; |
79 | 79 |
80 Result IncomingPacketFeedback(const PacketFeedback& packet_feedback); | 80 void IncomingPacketFeedback(const PacketFeedback& packet_feedback); |
81 Result OnLongFeedbackDelay(int64_t arrival_time_ms); | 81 Result OnLongFeedbackDelay(int64_t arrival_time_ms); |
| 82 |
| 83 Result MaybeUpdateEstimate(bool overusing); |
82 // Updates the current remote rate estimate and returns true if a valid | 84 // Updates the current remote rate estimate and returns true if a valid |
83 // estimate exists. | 85 // estimate exists. |
84 bool UpdateEstimate(int64_t packet_arrival_time_ms, | 86 bool UpdateEstimate(int64_t now_ms, |
85 int64_t now_ms, | |
86 rtc::Optional<uint32_t> acked_bitrate_bps, | 87 rtc::Optional<uint32_t> acked_bitrate_bps, |
| 88 bool overusing, |
87 uint32_t* target_bitrate_bps); | 89 uint32_t* target_bitrate_bps); |
88 | 90 |
89 rtc::ThreadChecker network_thread_; | 91 rtc::ThreadChecker network_thread_; |
90 RtcEventLog* const event_log_; | 92 RtcEventLog* const event_log_; |
91 const Clock* const clock_; | 93 const Clock* const clock_; |
92 std::unique_ptr<InterArrival> inter_arrival_; | 94 std::unique_ptr<InterArrival> inter_arrival_; |
93 std::unique_ptr<TrendlineEstimator> trendline_estimator_; | 95 std::unique_ptr<TrendlineEstimator> trendline_estimator_; |
94 OveruseDetector detector_; | 96 OveruseDetector detector_; |
95 BitrateEstimator receiver_incoming_bitrate_; | 97 BitrateEstimator receiver_incoming_bitrate_; |
96 int64_t last_update_ms_; | |
97 int64_t last_seen_packet_ms_; | 98 int64_t last_seen_packet_ms_; |
98 bool uma_recorded_; | 99 bool uma_recorded_; |
99 AimdRateControl rate_control_; | 100 AimdRateControl rate_control_; |
100 ProbeBitrateEstimator probe_bitrate_estimator_; | 101 ProbeBitrateEstimator probe_bitrate_estimator_; |
101 size_t trendline_window_size_; | 102 size_t trendline_window_size_; |
102 double trendline_smoothing_coeff_; | 103 double trendline_smoothing_coeff_; |
103 double trendline_threshold_gain_; | 104 double trendline_threshold_gain_; |
104 int consecutive_delayed_feedbacks_; | 105 int consecutive_delayed_feedbacks_; |
105 uint32_t last_logged_bitrate_; | 106 uint32_t last_logged_bitrate_; |
106 BandwidthUsage last_logged_state_; | 107 BandwidthUsage last_logged_state_; |
107 | 108 |
108 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(DelayBasedBwe); | 109 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(DelayBasedBwe); |
109 }; | 110 }; |
110 | 111 |
111 } // namespace webrtc | 112 } // namespace webrtc |
112 | 113 |
113 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_ | 114 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_ |
OLD | NEW |