| 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 580d08087b3e57d3ba3739d1ac31e4a50061ebd5..5111b8a2b88bda771be7856ab3dc2a97509b88ff 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
|
| @@ -65,8 +65,7 @@ void FrameLengthController::UpdateNetworkMetrics(
|
| overhead_bytes_per_packet_ = network_metrics.overhead_bytes_per_packet;
|
| }
|
|
|
| -void FrameLengthController::MakeDecision(
|
| - AudioNetworkAdaptor::EncoderRuntimeConfig* config) {
|
| +void FrameLengthController::MakeDecision(AudioEncoderRuntimeConfig* config) {
|
| // Decision on |frame_length_ms| should not have been made.
|
| RTC_DCHECK(!config->frame_length_ms);
|
|
|
| @@ -92,7 +91,7 @@ bool FrameLengthController::Config::FrameLengthChange::operator<(
|
| }
|
|
|
| bool FrameLengthController::FrameLengthIncreasingDecision(
|
| - const AudioNetworkAdaptor::EncoderRuntimeConfig& config) const {
|
| + const AudioEncoderRuntimeConfig& config) const {
|
| // Increase frame length if
|
| // 1. |uplink_bandwidth_bps| is known to be smaller or equal than
|
| // |min_encoder_bitrate_bps| plus |prevent_overuse_margin_bps| plus the
|
| @@ -129,7 +128,7 @@ bool FrameLengthController::FrameLengthIncreasingDecision(
|
| }
|
|
|
| bool FrameLengthController::FrameLengthDecreasingDecision(
|
| - const AudioNetworkAdaptor::EncoderRuntimeConfig& config) const {
|
| + const AudioEncoderRuntimeConfig& config) const {
|
| // Decrease frame length if
|
| // 1. shorter frame length is available AND
|
| // 2. |uplink_bandwidth_bps| is known to be bigger than
|
|
|