| Index: webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.cc
|
| diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.cc b/webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.cc
|
| index 1e78db8fc6106b5dbb82b855efa90bebbfeb592a..aec5e8cfdf3180cafa2f6cfc5a5e4eb54e6d19d7 100644
|
| --- a/webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.cc
|
| +++ b/webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.cc
|
| @@ -23,13 +23,17 @@ FrameLengthController::Config::Config(
|
| float fl_increasing_packet_loss_fraction,
|
| float fl_decreasing_packet_loss_fraction,
|
| int fl_20ms_to_60ms_bandwidth_bps,
|
| - int fl_60ms_to_20ms_bandwidth_bps)
|
| + int fl_60ms_to_20ms_bandwidth_bps,
|
| + int fl_60ms_to_120ms_bandwidth_bps,
|
| + int fl_120ms_to_60ms_bandwidth_bps)
|
| : encoder_frame_lengths_ms(encoder_frame_lengths_ms),
|
| initial_frame_length_ms(initial_frame_length_ms),
|
| fl_increasing_packet_loss_fraction(fl_increasing_packet_loss_fraction),
|
| fl_decreasing_packet_loss_fraction(fl_decreasing_packet_loss_fraction),
|
| fl_20ms_to_60ms_bandwidth_bps(fl_20ms_to_60ms_bandwidth_bps),
|
| - fl_60ms_to_20ms_bandwidth_bps(fl_60ms_to_20ms_bandwidth_bps) {}
|
| + fl_60ms_to_20ms_bandwidth_bps(fl_60ms_to_20ms_bandwidth_bps),
|
| + fl_60ms_to_120ms_bandwidth_bps(fl_60ms_to_120ms_bandwidth_bps),
|
| + fl_120ms_to_60ms_bandwidth_bps(fl_120ms_to_60ms_bandwidth_bps) {}
|
|
|
| FrameLengthController::Config::Config(const Config& other) = default;
|
|
|
| @@ -47,6 +51,10 @@ FrameLengthController::FrameLengthController(const Config& config)
|
| FrameLengthChange(20, 60), config_.fl_20ms_to_60ms_bandwidth_bps));
|
| frame_length_change_criteria_.insert(std::make_pair(
|
| FrameLengthChange(60, 20), config_.fl_60ms_to_20ms_bandwidth_bps));
|
| + frame_length_change_criteria_.insert(std::make_pair(
|
| + FrameLengthChange(60, 120), config_.fl_60ms_to_120ms_bandwidth_bps));
|
| + frame_length_change_criteria_.insert(std::make_pair(
|
| + FrameLengthChange(120, 60), config_.fl_120ms_to_60ms_bandwidth_bps));
|
| }
|
|
|
| FrameLengthController::~FrameLengthController() = default;
|
|
|