Remove the preprocessor symbol WEBRTC_CODEC_AVT (it was always defined)

webrtc/modules/audio_coding/main/acm2/acm_codec_database.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 57 matching lines @@
   // Mono and stereo.
   {120, "opus", 48000, 960, 2, 64000},
 #endif
   // Comfort noise for four different sampling frequencies.
   {13, "CN", 8000, 240, 1, 0},
   {98, "CN", 16000, 480, 1, 0},
   {99, "CN", 32000, 960, 1, 0},
 #ifdef ENABLE_48000_HZ
   {100, "CN", 48000, 1440, 1, 0},
 #endif
-#ifdef WEBRTC_CODEC_AVT
   {106, "telephone-event", 8000, 240, 1, 0},
-#endif
 #ifdef WEBRTC_CODEC_RED
   {127, "red", 8000, 0, 1, 0},
 #endif
   // To prevent compile errors due to trailing commas.
   {-1, "Null", -1, -1, -1, -1}
 };
 
 // Create database with all codec settings at compile time.
 // Each entry needs the following parameters in the given order:
 // Number of allowed packet sizes, a vector with the allowed packet sizes,
@@ skipping 36 matching lines @@
     // Mono and stereo.
     {4, {480, 960, 1920, 2880}, 0, 2, false},
 #endif
     // Comfort noise for three different sampling frequencies.
     {1, {240}, 240, 1, false},
     {1, {480}, 480, 1, false},
     {1, {960}, 960, 1, false},
 #ifdef ENABLE_48000_HZ
     {1, {1440}, 1440, 1, false},
 #endif
-#ifdef WEBRTC_CODEC_AVT
     {1, {240}, 240, 1, false},
-#endif
 #ifdef WEBRTC_CODEC_RED
     {1, {0}, 0, 1, false},
 #endif
     // To prevent compile errors due to trailing commas.
     {-1, {-1}, -1, -1, false}
 };
 
 // Create a database of all NetEQ decoders at compile time.
 const NetEqDecoder ACMCodecDB::neteq_decoders_[] = {
 #if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX))
@@ skipping 31 matching lines @@
     // Mono and stereo.
     kDecoderOpus,
 #endif
     // Comfort noise for three different sampling frequencies.
     kDecoderCNGnb,
     kDecoderCNGwb,
     kDecoderCNGswb32kHz
 #ifdef ENABLE_48000_HZ
     , kDecoderCNGswb48kHz
 #endif
-#ifdef WEBRTC_CODEC_AVT
     , kDecoderAVT
-#endif
 #ifdef WEBRTC_CODEC_RED
     , kDecoderRED
 #endif
 };
 
 // Get codec information from database.
 // TODO(tlegrand): replace memcpy with a pointer to the data base memory.
 int ACMCodecDB::Codec(int codec_id, CodecInst* codec_inst) {
   // Error check to see that codec_id is not out of bounds.
   if ((codec_id < 0) || (codec_id >= kNumCodecs)) {
@@ skipping 263 matching lines @@
 }
 
 bool ACMCodecDB::OwnsDecoder(int codec_id) {
   assert(codec_id >= 0 && codec_id < ACMCodecDB::kNumCodecs);
   return ACMCodecDB::codec_settings_[codec_id].owns_decoder;
 }
 
 }  // namespace acm2
 
 }  // namespace webrtc