Simplifying audio network adaptor by moving receiver frame length range to ctor.

webrtc/voice_engine/channel.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 1490 matching lines @@
   int success = -1;
   audio_coding_->QueryEncoder([&](AudioEncoder const* encoder) {
     if (encoder) {
       *enabled = encoder->GetDtx();
       success = 0;
     }
   });
   return success;
 }
 
-bool Channel::EnableAudioNetworkAdaptor(const std::string& config_string) {
+bool Channel::EnableAudioNetworkAdaptor(const std::string& config_string,
+                                        int min_receiver_frame_length_ms,
+                                        int max_receiver_frame_length_ms) {
   bool success = false;
   audio_coding_->ModifyEncoder([&](std::unique_ptr<AudioEncoder>* encoder) {
     if (*encoder) {
       success = (*encoder)->EnableAudioNetworkAdaptor(
-          config_string, Clock::GetRealTimeClock());
+          config_string, min_receiver_frame_length_ms,
+          max_receiver_frame_length_ms, Clock::GetRealTimeClock());
     }
   });
   return success;
 }
 
 void Channel::DisableAudioNetworkAdaptor() {
   audio_coding_->ModifyEncoder([&](std::unique_ptr<AudioEncoder>* encoder) {
     if (*encoder)
       (*encoder)->DisableAudioNetworkAdaptor();
   });
 }
 
-void Channel::SetReceiverFrameLengthRange(int min_frame_length_ms,
-                                          int max_frame_length_ms) {
-  audio_coding_->ModifyEncoder([&](std::unique_ptr<AudioEncoder>* encoder) {
-    if (*encoder) {
-      (*encoder)->SetReceiverFrameLengthRange(min_frame_length_ms,
-                                              max_frame_length_ms);
-    }
-  });
-}
-
 int32_t Channel::RegisterExternalTransport(Transport* transport) {
   WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId),
                "Channel::RegisterExternalTransport()");
 
   rtc::CritScope cs(&_callbackCritSect);
   if (_externalTransport) {
     _engineStatisticsPtr->SetLastError(
         VE_INVALID_OPERATION, kTraceError,
         "RegisterExternalTransport() external transport already enabled");
     return -1;
@@ skipping 1694 matching lines @@
   int64_t min_rtt = 0;
   if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) !=
       0) {
     return 0;
   }
   return rtt;
 }
 
 }  // namespace voe
 }  // namespace webrtc