| Index: webrtc/modules/audio_coding/acm2/acm_codec_database.cc
 | 
| diff --git a/webrtc/modules/audio_coding/acm2/acm_codec_database.cc b/webrtc/modules/audio_coding/acm2/acm_codec_database.cc
 | 
| index 5f3c07802b48a4f0f3966ad26e964c0309604a87..6587222218571c335618f2a8d2c85201aa8604c9 100644
 | 
| --- a/webrtc/modules/audio_coding/acm2/acm_codec_database.cc
 | 
| +++ b/webrtc/modules/audio_coding/acm2/acm_codec_database.cc
 | 
| @@ -102,6 +102,9 @@ const CodecInst ACMCodecDB::database_[] = {
 | 
|    {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
 | 
| @@ -158,6 +161,9 @@ const ACMCodecDB::CodecSettings ACMCodecDB::codec_settings_[] = {
 | 
|      {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
 | 
| @@ -203,7 +209,10 @@ const NetEqDecoder ACMCodecDB::neteq_decoders_[] = {
 | 
|  #ifdef ENABLE_48000_HZ
 | 
|      NetEqDecoder::kDecoderCNGswb48kHz,
 | 
|  #endif
 | 
| -    NetEqDecoder::kDecoderAVT,
 | 
| +    NetEqDecoder::kDecoderAVT8kHz,
 | 
| +    NetEqDecoder::kDecoderAVT16kHz,
 | 
| +    NetEqDecoder::kDecoderAVT32kHz,
 | 
| +    NetEqDecoder::kDecoderAVT48kHz,
 | 
|  #ifdef WEBRTC_CODEC_RED
 | 
|      NetEqDecoder::kDecoderRED,
 | 
|  #endif
 | 
| 
 |