Delete iSAC-fb from AudioCodingModule

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 50 matching lines @@
 
 // Not yet used payload-types.
 // 83,  82,  81, 80, 79,  78,  77,  76,  75,  74,  73,  72,  71,  70,  69, 68,
 // 67, 66, 65
 
 const CodecInst ACMCodecDB::database_[] = {
 #if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX))
   {103, "ISAC", 16000, kIsacPacSize480, 1, kIsacWbDefaultRate},
 # if (defined(WEBRTC_CODEC_ISAC))
   {104, "ISAC", 32000, kIsacPacSize960, 1, kIsacSwbDefaultRate},
-  {105, "ISAC", 48000, kIsacPacSize1440, 1, kIsacSwbDefaultRate},
 # endif
 #endif
   // Mono
   {107, "L16", 8000, 80, 1, 128000},
   {108, "L16", 16000, 160, 1, 256000},
   {109, "L16", 32000, 320, 1, 512000},
   // Stereo
   {111, "L16", 8000, 80, 2, 128000},
   {112, "L16", 16000, 160, 2, 256000},
   {113, "L16", 32000, 320, 2, 512000},
@@ skipping 35 matching lines @@
 
 // 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,
 // Basic block samples, max number of channels that are supported.
 const ACMCodecDB::CodecSettings ACMCodecDB::codec_settings_[] = {
 #if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX))
     {2, {kIsacPacSize480, kIsacPacSize960}, 0, 1},
 # if (defined(WEBRTC_CODEC_ISAC))
     {1, {kIsacPacSize960}, 0, 1},
-    {1, {kIsacPacSize1440}, 0, 1},
 # endif
 #endif
     // Mono
     {4, {80, 160, 240, 320}, 0, 2},
     {4, {160, 320, 480, 640}, 0, 2},
     {2, {320, 640}, 0, 2},
     // Stereo
     {4, {80, 160, 240, 320}, 0, 2},
     {4, {160, 320, 480, 640}, 0, 2},
     {2, {320, 640}, 0, 2},
@@ skipping 33 matching lines @@
     // To prevent compile errors due to trailing commas.
     {-1, {-1}, -1, -1}
 };
 
 // Create a database of all NetEQ decoders at compile time.
 const NetEqDecoder ACMCodecDB::neteq_decoders_[] = {
 #if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX))
     kDecoderISAC,
 # if (defined(WEBRTC_CODEC_ISAC))
     kDecoderISACswb,
-    kDecoderISACfb,
 # endif
 #endif
     // Mono
     kDecoderPCM16B,
     kDecoderPCM16Bwb,
     kDecoderPCM16Bswb32kHz,
     // Stereo
     kDecoderPCM16B_2ch,
     kDecoderPCM16Bwb_2ch,
     kDecoderPCM16Bswb32kHz_2ch,
@@ skipping 174 matching lines @@
 }
 
 // Checks if the payload type is in the valid range.
 bool ACMCodecDB::ValidPayloadType(int payload_type) {
   return (payload_type >= 0) && (payload_type <= 127);
 }
 
 }  // namespace acm2
 
 }  // namespace webrtc