Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(145)

Side by Side Diff: webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h

Issue 2672933003: Introduce FecControllerRplrBased (Closed)
Patch Set: Merged Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
11 #ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_PLR_BAS ED_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_PLR_BAS ED_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" 17 #include "webrtc/common_audio/smoothing_filter.h"
18 #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" 18 #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h"
19 19
20 namespace webrtc { 20 namespace webrtc {
21 21
22 class FecController final : public Controller { 22 class FecControllerPlrBased 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 // packet ^ |
30 // loss | A| 30 // loss | A|
31 // | \ A: (low_bandwidth_bps, low_bandwidth_packet_loss) 31 // | \ A: (low_bandwidth_bps, low_bandwidth_packet_loss)
32 // | \ B: (high_bandwidth_bps, high_bandwidth_packet_loss) 32 // | \ B: (high_bandwidth_bps, high_bandwidth_packet_loss)
(...skipping 25 matching lines...) Expand all
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 // Dependency injection for testing. 67 // Dependency injection for testing.
68 FecController(const Config& config, 68 FecControllerPlrBased(const Config& config,
69 std::unique_ptr<SmoothingFilter> smoothing_filter); 69 std::unique_ptr<SmoothingFilter> smoothing_filter);
70 70
71 explicit FecController(const Config& config); 71 explicit FecControllerPlrBased(const Config& config);
72 72
73 ~FecController() override; 73 ~FecControllerPlrBased() 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 packet_loss = slope * bandwidth + offset.
81 struct ThresholdInfo { 81 struct ThresholdInfo {
82 explicit ThresholdInfo(const Config::Threshold& threshold); 82 explicit ThresholdInfo(const Config::Threshold& threshold);
83 float slope; 83 float slope;
84 float offset; 84 float offset;
85 }; 85 };
86 86
87 float GetPacketLossThreshold(int bandwidth_bps, 87 float GetPacketLossThreshold(int bandwidth_bps,
88 const Config::Threshold& threshold, 88 const Config::Threshold& threshold,
89 const ThresholdInfo& threshold_info) const; 89 const ThresholdInfo& threshold_info) const;
90 90
91 bool FecEnablingDecision(const rtc::Optional<float>& packet_loss) const; 91 bool FecEnablingDecision(const rtc::Optional<float>& packet_loss) const;
92 bool FecDisablingDecision(const rtc::Optional<float>& packet_loss) const; 92 bool FecDisablingDecision(const rtc::Optional<float>& packet_loss) const;
93 93
94 const Config config_; 94 const Config config_;
95 bool fec_enabled_; 95 bool fec_enabled_;
96 rtc::Optional<int> uplink_bandwidth_bps_; 96 rtc::Optional<int> uplink_bandwidth_bps_;
97 const std::unique_ptr<SmoothingFilter> packet_loss_smoother_; 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(FecControllerPlrBased);
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_PLR_ BASED_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698