Move the stereo-disables-CNG logic from CodecManager to Rent-A-Codec

webrtc/modules/audio_coding/main/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 131 matching lines @@
       return 0;
     case RentACodec::RegistrationResult::kBadFreq:
       WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, dummy_id,
                    "RegisterSendCodec() failed, invalid frequency for CNG"
                    " registration");
       return -1;
     case RentACodec::RegistrationResult::kSkip:
       break;
   }
 
-  // Set Stereo, and make sure VAD and DTX is turned off.
-  if (send_codec.channels != 1) {
-    if (codec_stack_params_.use_cng) {
-      WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceAudioCoding, dummy_id,
-                   "VAD/DTX is turned off, not supported when sending stereo.");
-    }
-    codec_stack_params_.use_cng = false;
-  }
-
   // Check if the codec is already registered as send codec.
   bool new_codec = true;
   if (CurrentEncoder()) {
     auto new_codec_id = RentACodec::CodecIdByInst(send_codec_inst_);
     RTC_DCHECK(new_codec_id);
     auto old_codec_id = RentACodec::CodecIdFromIndex(codec_id);
     new_codec = !old_codec_id || *new_codec_id != *old_codec_id;
   }
 
   encoder_is_opus_ = IsOpus(send_codec);
@@ skipping 53 matching lines @@
   send_codec_inst_.plfreq = external_speech_encoder->SampleRateHz();
   send_codec_inst_.pacsize = rtc::CheckedDivExact(
       static_cast<int>(external_speech_encoder->Max10MsFramesInAPacket() *
                        send_codec_inst_.plfreq),
       100);
   send_codec_inst_.pltype = -1;  // Not valid.
   send_codec_inst_.rate = -1;    // Not valid.
   static const char kName[] = "external";
   memcpy(send_codec_inst_.plname, kName, sizeof(kName));
 
-  if (send_codec_inst_.channels != 1)
-    codec_stack_params_.use_cng = false;
   if (codec_stack_params_.use_codec_fec) {
     // Switch FEC on. On failure, remember that FEC is off.
     if (!external_speech_encoder->SetFec(true))
       codec_stack_params_.use_codec_fec = false;
   } else {
     // Switch FEC off. This shouldn't fail.
     const bool success = external_speech_encoder->SetFec(false);
     RTC_DCHECK(success);
   }
 
@@ skipping 87 matching lines @@
       CurrentEncoder()->SetFec(enable_codec_fec) && enable_codec_fec;
   return codec_stack_params_.use_codec_fec == enable_codec_fec ? 0 : -1;
 }
 
 AudioDecoder* CodecManager::GetAudioDecoder(const CodecInst& codec) {
   return IsIsac(codec) ? rent_a_codec_.RentIsacDecoder() : nullptr;
 }
 
 }  // namespace acm2
 }  // namespace webrtc