Allowing resetting of AudioNetworkAdaptor in AudioSendStream.

webrtc/audio/audio_send_stream.cc

 /*
  *  Copyright (c) 2015 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 274 matching lines @@
 bool AudioSendStream::SetupSendCodec() {
   ScopedVoEInterface<VoEBase> base(voice_engine());
   ScopedVoEInterface<VoECodec> codec(voice_engine());
 
   const int channel = config_.voe_channel_id;
 
   // Disable VAD and FEC unless we know the other side wants them.
   codec->SetVADStatus(channel, false);
   codec->SetFECStatus(channel, false);
 
+  // We disable audio network adaptor here. This will on one hand make sure that
+  // audio network adaptor is disabled by default, and on the other allow audio
+  // network adaptor to be reconfigured, since SetReceiverFrameLengthRange can
+  // be only called when audio network adaptor is disabled.
+  channel_proxy_->DisableAudioNetworkAdaptor();
+
   const auto& send_codec_spec = config_.send_codec_spec;
 
   // We set the codec first, since the below extra configuration is only applied
   // to the "current" codec.
 
   // If codec is already configured, we do not it again.
   // TODO(minyue): check if this check is really needed, or can we move it into
   // |codec->SetSendCodec|.
   webrtc::CodecInst current_codec = {0};
   if (codec->GetSendCodec(channel, current_codec) != 0 ||
@@ skipping 33 matching lines @@
     if (config_.audio_network_adaptor_config) {
       // Audio network adaptor is only allowed for Opus currently.
       // |SetReceiverFrameLengthRange| needs to be called before
       // |EnableAudioNetworkAdaptor|.
       channel_proxy_->SetReceiverFrameLengthRange(send_codec_spec.min_ptime_ms,
                                                   send_codec_spec.max_ptime_ms);
       channel_proxy_->EnableAudioNetworkAdaptor(
           *config_.audio_network_adaptor_config);
       LOG(LS_INFO) << "Audio network adaptor enabled on SSRC "
                    << config_.rtp.ssrc;
-    } else {
-      channel_proxy_->DisableAudioNetworkAdaptor();
     }
   }
 
   // Set the CN payloadtype and the VAD status.
   if (send_codec_spec.cng_payload_type != -1) {
     // The CN payload type for 8000 Hz clockrate is fixed at 13.
     if (send_codec_spec.cng_plfreq != 8000) {
       webrtc::PayloadFrequencies cn_freq;
       switch (send_codec_spec.cng_plfreq) {
         case 16000:
@@ skipping 31 matching lines @@
         LOG(LS_WARNING) << "SetVADStatus() failed: " << base->LastError();
         return false;
       }
     }
   }
   return true;
 }
 
 }  // namespace internal
 }  // namespace webrtc