OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2017 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 |
11 #ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_H_ | 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_RPLR_BA
SED_H_ |
12 #define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_H_ | 12 #define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_RPLR_BA
SED_H_ |
13 | 13 |
14 #include <memory> | 14 #include <memory> |
15 | 15 |
16 #include "webrtc/base/constructormagic.h" | 16 #include "webrtc/base/constructormagic.h" |
17 #include "webrtc/common_audio/smoothing_filter.h" | |
18 #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" | 17 #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" |
| 18 #include "webrtc/system_wrappers/include/clock.h" |
19 | 19 |
20 namespace webrtc { | 20 namespace webrtc { |
21 | 21 |
22 class FecController final : public Controller { | 22 class FecControllerRplrBased final : public Controller { |
23 public: | 23 public: |
24 struct Config { | 24 struct Config { |
25 struct Threshold { | 25 struct Threshold { |
26 // Threshold defines a curve in the bandwidth/packet-loss domain. The | 26 // Threshold defines a curve in the bandwidth/packet-loss domain. The |
27 // curve is characterized by the two conjunction points: A and B. | 27 // curve is characterized by the two conjunction points: A and B. |
28 // | 28 // |
29 // packet ^ | | 29 // recoverable |
30 // loss | A| | 30 // packet ^ | |
31 // | \ A: (low_bandwidth_bps, low_bandwidth_packet_loss) | 31 // loss | A | |
32 // | \ B: (high_bandwidth_bps, high_bandwidth_packet_loss) | 32 // | \ A: (low_bandwidth_bps, |
33 // | B\________ | 33 // | \ low_bandwidth_recoverable_packet_loss) |
34 // |---------------> bandwidth | 34 // | \ B: (high_bandwidth_bps, |
| 35 // | \ high_bandwidth_recoverable_packet_loss) |
| 36 // | B \________ |
| 37 // |---------------> bandwidth |
35 Threshold(int low_bandwidth_bps, | 38 Threshold(int low_bandwidth_bps, |
36 float low_bandwidth_packet_loss, | 39 float low_bandwidth_recoverable_packet_loss, |
37 int high_bandwidth_bps, | 40 int high_bandwidth_bps, |
38 float high_bandwidth_packet_loss); | 41 float high_bandwidth_recoverable_packet_loss); |
39 int low_bandwidth_bps; | 42 int low_bandwidth_bps; |
40 float low_bandwidth_packet_loss; | 43 float low_bandwidth_recoverable_packet_loss; |
41 int high_bandwidth_bps; | 44 int high_bandwidth_bps; |
42 float high_bandwidth_packet_loss; | 45 float high_bandwidth_recoverable_packet_loss; |
43 }; | 46 }; |
44 | 47 |
45 // |fec_enabling_threshold| defines a curve, above which FEC should be | 48 // |fec_enabling_threshold| defines a curve, above which FEC should be |
46 // enabled. |fec_disabling_threshold| defines a curve, under which FEC | 49 // enabled. |fec_disabling_threshold| defines a curve, under which FEC |
47 // should be disabled. See below | 50 // should be disabled. See below |
48 // | 51 // |
| 52 // recoverable |
49 // packet-loss ^ | | | 53 // packet-loss ^ | | |
50 // | | | FEC | 54 // | | | FEC |
51 // | \ \ ON | 55 // | \ \ ON |
52 // | FEC \ \_______ fec_enabling_threshold | 56 // | FEC \ \_______ fec_enabling_threshold |
53 // | OFF \_________ fec_disabling_threshold | 57 // | OFF \_________ fec_disabling_threshold |
54 // |-----------------> bandwidth | 58 // |-----------------> bandwidth |
55 Config(bool initial_fec_enabled, | 59 Config(bool initial_fec_enabled, |
56 const Threshold& fec_enabling_threshold, | 60 const Threshold& fec_enabling_threshold, |
57 const Threshold& fec_disabling_threshold, | 61 const Threshold& fec_disabling_threshold, |
58 int time_constant_ms, | 62 int time_constant_ms, |
59 const Clock* clock); | 63 const Clock* clock); |
60 bool initial_fec_enabled; | 64 bool initial_fec_enabled; |
61 Threshold fec_enabling_threshold; | 65 Threshold fec_enabling_threshold; |
62 Threshold fec_disabling_threshold; | 66 Threshold fec_disabling_threshold; |
63 int time_constant_ms; | 67 int time_constant_ms; |
64 const Clock* clock; | 68 const Clock* clock; |
65 }; | 69 }; |
66 | 70 |
67 // Dependency injection for testing. | 71 explicit FecControllerRplrBased(const Config& config); |
68 FecController(const Config& config, | |
69 std::unique_ptr<SmoothingFilter> smoothing_filter); | |
70 | 72 |
71 explicit FecController(const Config& config); | 73 ~FecControllerRplrBased() override; |
72 | |
73 ~FecController() override; | |
74 | 74 |
75 void UpdateNetworkMetrics(const NetworkMetrics& network_metrics) override; | 75 void UpdateNetworkMetrics(const NetworkMetrics& network_metrics) override; |
76 | 76 |
77 void MakeDecision(AudioNetworkAdaptor::EncoderRuntimeConfig* config) override; | 77 void MakeDecision(AudioNetworkAdaptor::EncoderRuntimeConfig* config) override; |
78 | 78 |
79 private: | 79 private: |
80 // Characterize Threshold with packet_loss = slope * bandwidth + offset. | 80 // Characterize Threshold with: |
| 81 // recoverable_packet_loss = slope * bandwidth + offset. |
81 struct ThresholdInfo { | 82 struct ThresholdInfo { |
82 explicit ThresholdInfo(const Config::Threshold& threshold); | 83 explicit ThresholdInfo(const Config::Threshold& threshold); |
83 float slope; | 84 float slope; |
84 float offset; | 85 float offset; |
85 }; | 86 }; |
86 | 87 |
87 float GetPacketLossThreshold(int bandwidth_bps, | 88 float GetPacketLossThreshold(int bandwidth_bps, |
88 const Config::Threshold& threshold, | 89 const Config::Threshold& threshold, |
89 const ThresholdInfo& threshold_info) const; | 90 const ThresholdInfo& threshold_info) const; |
90 | 91 |
91 bool FecEnablingDecision(const rtc::Optional<float>& packet_loss) const; | 92 bool FecEnablingDecision() const; |
92 bool FecDisablingDecision(const rtc::Optional<float>& packet_loss) const; | 93 bool FecDisablingDecision() const; |
93 | 94 |
94 const Config config_; | 95 const Config config_; |
95 bool fec_enabled_; | 96 bool fec_enabled_; |
96 rtc::Optional<int> uplink_bandwidth_bps_; | 97 rtc::Optional<int> uplink_bandwidth_bps_; |
97 const std::unique_ptr<SmoothingFilter> packet_loss_smoother_; | 98 rtc::Optional<float> uplink_recoverable_packet_loss_; |
98 | 99 |
99 const ThresholdInfo fec_enabling_threshold_info_; | 100 const ThresholdInfo fec_enabling_threshold_info_; |
100 const ThresholdInfo fec_disabling_threshold_info_; | 101 const ThresholdInfo fec_disabling_threshold_info_; |
101 | 102 |
102 RTC_DISALLOW_COPY_AND_ASSIGN(FecController); | 103 RTC_DISALLOW_COPY_AND_ASSIGN(FecControllerRplrBased); |
103 }; | 104 }; |
104 | 105 |
105 } // namespace webrtc | 106 } // namespace webrtc |
106 | 107 |
107 #endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_H_ | 108 #endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_RPLR
_BASED_H_ |
OLD | NEW |