Chromium Code Reviews| Index: webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc |
| diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc b/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc |
| index 5fa1bee8e9dfddb9565c4906c374e31d6e439ece..0db5429650520384dcbb0bbb3532aa10cb3f0d30 100644 |
| --- a/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc |
| +++ b/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc |
| @@ -42,11 +42,31 @@ void AudioNetworkAdaptorImpl::SetUplinkPacketLossFraction( |
| DumpNetworkMetrics(); |
| } |
| +void AudioNetworkAdaptorImpl::SetTargetAudioBitrate( |
|
minyue-webrtc
2016/09/29 15:34:25
due to rebasing
kwiberg-webrtc
2016/10/03 12:48:10
Acknowledged.
|
| + int target_audio_bitrate_bps) { |
| + last_metrics_.target_audio_bitrate_bps = |
| + rtc::Optional<int>(target_audio_bitrate_bps); |
| + DumpNetworkMetrics(); |
| +} |
| + |
| void AudioNetworkAdaptorImpl::SetRtt(int rtt_ms) { |
| last_metrics_.rtt_ms = rtc::Optional<int>(rtt_ms); |
| DumpNetworkMetrics(); |
| } |
| +void AudioNetworkAdaptorImpl::SetReceiverFrameLengthRange( |
|
minyue-webrtc
2016/09/29 15:34:25
due to rebasing
kwiberg-webrtc
2016/10/03 12:48:10
Acknowledged.
|
| + int min_frame_length_ms, |
| + int max_frame_length_ms) { |
| + Controller::Constraints constraints; |
| + constraints.receiver_frame_length_range = |
| + rtc::Optional<Controller::Constraints::FrameLengthRange>( |
| + Controller::Constraints::FrameLengthRange(min_frame_length_ms, |
| + max_frame_length_ms)); |
| + auto controllers = controller_manager_->GetControllers(); |
| + for (auto& controller : controllers) |
| + controller->SetConstraints(constraints); |
| +} |
| + |
| AudioNetworkAdaptor::EncoderRuntimeConfig |
| AudioNetworkAdaptorImpl::GetEncoderRuntimeConfig() { |
| EncoderRuntimeConfig config; |
| @@ -62,19 +82,6 @@ AudioNetworkAdaptorImpl::GetEncoderRuntimeConfig() { |
| return config; |
| } |
| -void AudioNetworkAdaptorImpl::SetReceiverFrameLengthRange( |
|
kwiberg-webrtc
2016/10/03 12:48:10
Also because rebase?
minyue-webrtc
2016/10/03 12:57:14
yes, a landed cl moved the position of this functi
|
| - int min_frame_length_ms, |
| - int max_frame_length_ms) { |
| - Controller::Constraints constraints; |
| - constraints.receiver_frame_length_range = |
| - rtc::Optional<Controller::Constraints::FrameLengthRange>( |
| - Controller::Constraints::FrameLengthRange(min_frame_length_ms, |
| - max_frame_length_ms)); |
| - auto controllers = controller_manager_->GetControllers(); |
| - for (auto& controller : controllers) |
| - controller->SetConstraints(constraints); |
| -} |
| - |
| void AudioNetworkAdaptorImpl::StartDebugDump(FILE* file_handle) { |
| debug_dump_writer_ = DebugDumpWriter::Create(file_handle); |
| } |