Multi frequency DTMF support - receiver side

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.
  */
 
@@ skipping 84 matching lines @@
   {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
   {106, "telephone-event", 8000, 240, 1, 0},
+  {114, "telephone-event", 16000, 240, 1, 0},  // TODO:
+  {115, "telephone-event", 32000, 240, 1, 0},  // TODO:
+  {116, "telephone-event", 48000, 240, 1, 0},  // TODO:
 #ifdef WEBRTC_CODEC_RED
   {127, "red", 8000, 0, 1, 0},
 #endif
   // 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,
@@ skipping 36 matching lines @@
     {4, {480, 960, 1920, 2880}, 0, 2},
 #endif
     // Comfort noise for three different sampling frequencies.
     {1, {240}, 240, 1},
     {1, {480}, 480, 1},
     {1, {960}, 960, 1},
 #ifdef ENABLE_48000_HZ
     {1, {1440}, 1440, 1},
 #endif
     {1, {240}, 240, 1},
+    {1, {240}, 240, 1},
+    {1, {240}, 240, 1},
+    {1, {240}, 240, 1},
 #ifdef WEBRTC_CODEC_RED
     {1, {0}, 0, 1},
 #endif
     // To prevent compile errors due to trailing commas.
     {-1, {-1}, -1, 0}
 };
 
 // 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 25 matching lines @@
 #ifdef WEBRTC_CODEC_OPUS
     // Mono and stereo.
     NetEqDecoder::kDecoderOpus,
 #endif
     // Comfort noise for three different sampling frequencies.
     NetEqDecoder::kDecoderCNGnb, NetEqDecoder::kDecoderCNGwb,
     NetEqDecoder::kDecoderCNGswb32kHz,
 #ifdef ENABLE_48000_HZ
     NetEqDecoder::kDecoderCNGswb48kHz,
 #endif
-    NetEqDecoder::kDecoderAVT,
+    NetEqDecoder::kDecoderAVT8kHz,
+    NetEqDecoder::kDecoderAVT16kHz,
+    NetEqDecoder::kDecoderAVT32kHz,
+    NetEqDecoder::kDecoderAVT48kHz,
 #ifdef WEBRTC_CODEC_RED
     NetEqDecoder::kDecoderRED,
 #endif
 };
 
 // Enumerator for error codes when asking for codec database id.
 enum {
   kInvalidCodec = -10,
   kInvalidPayloadtype = -30,
   kInvalidPacketSize = -40,
@@ skipping 107 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