Fix cyclic deps: rent_a_codec<->audio_coding and rent_a_codec<->neteq

webrtc/modules/audio_coding/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.
  */
 
 /*
  * This file generates databases with information about all supported audio
  * codecs.
  */
 
 // TODO(tlegrand): Change constant input pointers in all functions to constant
 // references, where appropriate.
 #include "webrtc/modules/audio_coding/acm2/acm_codec_database.h"
 
 #include <assert.h>
 
 #include "webrtc/base/checks.h"
-#include "webrtc/modules/audio_coding/acm2/acm_common_defs.h"
 #include "webrtc/system_wrappers/include/trace.h"
 
+#if ((defined WEBRTC_CODEC_ISAC) && (defined WEBRTC_CODEC_ISACFX))
+#error iSAC and iSACFX codecs cannot be enabled at the same time
+#endif
+
 namespace webrtc {
 
 namespace acm2 {
 
 namespace {
 
 // Checks if the bitrate is valid for iSAC.
 bool IsISACRateValid(int rate) {
   return (rate == -1) || ((rate <= 56000) && (rate >= 10000));
 }
@@ skipping 17 matching lines @@
 }
 
 }  // namespace
 
 // 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},
+  {103, "ISAC", 16000, 480, 1, 32000},
 # if (defined(WEBRTC_CODEC_ISAC))
-  {104, "ISAC", 32000, kIsacPacSize960, 1, kIsacSwbDefaultRate},
+  {104, "ISAC", 32000, 960, 1, 56000},
 # 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 @@
   // To prevent compile errors due to trailing commas.
   {-1, "Null", -1, -1, 0, -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,
 // 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},
+    {2, {480, 960}, 0, 1},
 # if (defined(WEBRTC_CODEC_ISAC))
-    {1, {kIsacPacSize960}, 0, 1},
+    {1, {960}, 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 204 matching lines @@
 }
 // Gets codec id number from database for the receiver.
 int ACMCodecDB::ReceiverCodecNumber(const CodecInst& codec_inst) {
   // Look for a matching codec in the database.
   return CodecId(codec_inst);
 }
 
 }  // namespace acm2
 
 }  // namespace webrtc