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 * FEC and NACK added bitrate is handled outside class | 10 * FEC and NACK added bitrate is handled outside class |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 | 62 |
63 // Returns the input bitrate capped to the thresholds defined by the max, | 63 // Returns the input bitrate capped to the thresholds defined by the max, |
64 // min and incoming bandwidth. | 64 // min and incoming bandwidth. |
65 uint32_t CapBitrateToThresholds(int64_t now_ms, uint32_t bitrate); | 65 uint32_t CapBitrateToThresholds(int64_t now_ms, uint32_t bitrate); |
66 | 66 |
67 // Updates history of min bitrates. | 67 // Updates history of min bitrates. |
68 // After this method returns min_bitrate_history_.front().second contains the | 68 // After this method returns min_bitrate_history_.front().second contains the |
69 // min bitrate used during last kBweIncreaseIntervalMs. | 69 // min bitrate used during last kBweIncreaseIntervalMs. |
70 void UpdateMinHistory(int64_t now_ms); | 70 void UpdateMinHistory(int64_t now_ms); |
71 | 71 |
| 72 void CapAndLogBitrate(int64_t now_ms, uint32_t bitrate_bps); |
| 73 |
72 std::deque<std::pair<int64_t, uint32_t> > min_bitrate_history_; | 74 std::deque<std::pair<int64_t, uint32_t> > min_bitrate_history_; |
73 | 75 |
74 // incoming filters | 76 // incoming filters |
75 int lost_packets_since_last_loss_update_Q8_; | 77 int lost_packets_since_last_loss_update_Q8_; |
76 int expected_packets_since_last_loss_update_; | 78 int expected_packets_since_last_loss_update_; |
77 | 79 |
78 uint32_t bitrate_; | 80 uint32_t current_bitrate_bps_; |
79 uint32_t min_bitrate_configured_; | 81 uint32_t min_bitrate_configured_; |
80 uint32_t max_bitrate_configured_; | 82 uint32_t max_bitrate_configured_; |
81 int64_t last_low_bitrate_log_ms_; | 83 int64_t last_low_bitrate_log_ms_; |
82 | 84 |
83 bool has_decreased_since_last_fraction_loss_; | 85 bool has_decreased_since_last_fraction_loss_; |
84 int64_t last_feedback_ms_; | 86 int64_t last_feedback_ms_; |
85 int64_t last_packet_report_ms_; | 87 int64_t last_packet_report_ms_; |
86 int64_t last_timeout_ms_; | 88 int64_t last_timeout_ms_; |
87 uint8_t last_fraction_loss_; | 89 uint8_t last_fraction_loss_; |
88 uint8_t last_logged_fraction_loss_; | 90 uint8_t last_logged_fraction_loss_; |
89 int64_t last_round_trip_time_ms_; | 91 int64_t last_round_trip_time_ms_; |
90 | 92 |
91 uint32_t bwe_incoming_; | 93 uint32_t bwe_incoming_; |
92 uint32_t delay_based_bitrate_bps_; | 94 uint32_t delay_based_bitrate_bps_; |
93 int64_t time_last_decrease_ms_; | 95 int64_t time_last_decrease_ms_; |
94 int64_t first_report_time_ms_; | 96 int64_t first_report_time_ms_; |
95 int initially_lost_packets_; | 97 int initially_lost_packets_; |
96 int bitrate_at_2_seconds_kbps_; | 98 int bitrate_at_2_seconds_kbps_; |
97 UmaState uma_update_state_; | 99 UmaState uma_update_state_; |
98 std::vector<bool> rampup_uma_stats_updated_; | 100 std::vector<bool> rampup_uma_stats_updated_; |
99 RtcEventLog* event_log_; | 101 RtcEventLog* event_log_; |
100 int64_t last_rtc_event_log_ms_; | 102 int64_t last_rtc_event_log_ms_; |
101 bool in_timeout_experiment_; | 103 bool in_timeout_experiment_; |
102 float low_loss_threshold_; | 104 float low_loss_threshold_; |
103 float high_loss_threshold_; | 105 float high_loss_threshold_; |
104 uint32_t bitrate_threshold_bps_; | 106 uint32_t bitrate_threshold_bps_; |
105 }; | 107 }; |
106 } // namespace webrtc | 108 } // namespace webrtc |
107 #endif // WEBRTC_MODULES_BITRATE_CONTROLLER_SEND_SIDE_BANDWIDTH_ESTIMATION_H_ | 109 #endif // WEBRTC_MODULES_BITRATE_CONTROLLER_SEND_SIDE_BANDWIDTH_ESTIMATION_H_ |
OLD | NEW |