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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 const Threshold& fec_disabling_threshold, | 57 const Threshold& fec_disabling_threshold, |
58 int time_constant_ms, | 58 int time_constant_ms, |
59 const Clock* clock); | 59 const Clock* clock); |
60 bool initial_fec_enabled; | 60 bool initial_fec_enabled; |
61 Threshold fec_enabling_threshold; | 61 Threshold fec_enabling_threshold; |
62 Threshold fec_disabling_threshold; | 62 Threshold fec_disabling_threshold; |
63 int time_constant_ms; | 63 int time_constant_ms; |
64 const Clock* clock; | 64 const Clock* clock; |
65 }; | 65 }; |
66 | 66 |
67 explicit FecController(const Config& config); | |
68 | |
69 // Dependency injection for testing. | 67 // Dependency injection for testing. |
70 FecController(const Config& config, | 68 FecController(const Config& config, |
71 std::unique_ptr<SmoothingFilter> smoothing_filter); | 69 std::unique_ptr<SmoothingFilter> smoothing_filter); |
72 | 70 |
| 71 explicit FecController(const Config& config); |
| 72 |
73 ~FecController() override; | 73 ~FecController() override; |
74 | 74 |
75 void MakeDecision(const NetworkMetrics& metrics, | 75 void UpdateNetworkMetrics(const NetworkMetrics& network_metrics) override; |
76 AudioNetworkAdaptor::EncoderRuntimeConfig* config) override; | 76 |
| 77 void MakeDecision(AudioNetworkAdaptor::EncoderRuntimeConfig* config) override; |
77 | 78 |
78 private: | 79 private: |
79 // Characterize Threshold with packet_loss = slope * bandwidth + offset. | 80 // Characterize Threshold with packet_loss = slope * bandwidth + offset. |
80 struct ThresholdInfo { | 81 struct ThresholdInfo { |
81 explicit ThresholdInfo(const Config::Threshold& threshold); | 82 explicit ThresholdInfo(const Config::Threshold& threshold); |
82 float slope; | 83 float slope; |
83 float offset; | 84 float offset; |
84 }; | 85 }; |
85 | 86 |
86 float GetPacketLossThreshold(int bandwidth_bps, | 87 float GetPacketLossThreshold(int bandwidth_bps, |
87 const Config::Threshold& threshold, | 88 const Config::Threshold& threshold, |
88 const ThresholdInfo& threshold_info) const; | 89 const ThresholdInfo& threshold_info) const; |
89 | 90 |
90 bool FecEnablingDecision(const NetworkMetrics& metrics, | 91 bool FecEnablingDecision(const rtc::Optional<float>& packet_loss) const; |
91 const rtc::Optional<float>& packet_loss) const; | 92 bool FecDisablingDecision(const rtc::Optional<float>& packet_loss) const; |
92 bool FecDisablingDecision(const NetworkMetrics& metrics, | |
93 const rtc::Optional<float>& packet_loss) const; | |
94 | 93 |
95 const Config config_; | 94 const Config config_; |
96 bool fec_enabled_; | 95 bool fec_enabled_; |
97 std::unique_ptr<SmoothingFilter> packet_loss_smoothed_; | 96 rtc::Optional<int> uplink_bandwidth_bps_; |
| 97 const std::unique_ptr<SmoothingFilter> packet_loss_smoother_; |
98 | 98 |
99 const ThresholdInfo fec_enabling_threshold_info_; | 99 const ThresholdInfo fec_enabling_threshold_info_; |
100 const ThresholdInfo fec_disabling_threshold_info_; | 100 const ThresholdInfo fec_disabling_threshold_info_; |
101 | 101 |
102 RTC_DISALLOW_COPY_AND_ASSIGN(FecController); | 102 RTC_DISALLOW_COPY_AND_ASSIGN(FecController); |
103 }; | 103 }; |
104 | 104 |
105 } // namespace webrtc | 105 } // namespace webrtc |
106 | 106 |
107 #endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_H_ | 107 #endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_H_ |
OLD | NEW |