AudioCodingModuleImpl: Stop failing artificially for non-Opus encoders

webrtc/modules/audio_coding/acm2/codec_manager.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 148 matching lines @@
   const bool stereo_send =
       codec_stack_params_.speech_encoder
           ? (codec_stack_params_.speech_encoder->NumChannels() != 1)
           : false;
   if (enable && stereo_send) {
     WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, 0,
                  "VAD/DTX not supported for stereo sending");
     return false;
   }
 
-  if (CurrentEncoderIsOpus()) {
+  // TODO(kwiberg): This doesn't protect Opus when injected as an external
+  // encoder.
+  if (send_codec_inst_ && IsOpus(*send_codec_inst_)) {
     // VAD/DTX not supported, but don't fail.
     enable = false;
   }
 
   codec_stack_params_.use_cng = enable;
   codec_stack_params_.vad_mode = mode;
   return true;
 }
 
 bool CodecManager::SetCodecFEC(bool enable_codec_fec) {
   if (enable_codec_fec && codec_stack_params_.use_red) {
     WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceAudioCoding, 0,
                  "Codec internal FEC and RED cannot be co-enabled.");
     return false;
   }
 
   codec_stack_params_.use_codec_fec = enable_codec_fec;
   return true;
 }
 
-bool CodecManager::CurrentEncoderIsOpus() const {
-  return send_codec_inst_ ? IsOpus(*send_codec_inst_) : false;
-}
-
 }  // namespace acm2
 }  // namespace webrtc