| 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..4f5b263c24cbf71aabc1e61c45fbdf0016ec92f7 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},
|
| + {115, "telephone-event", 32000, 240, 1, 0},
|
| + {116, "telephone-event", 48000, 240, 1, 0},
|
| #ifdef WEBRTC_CODEC_RED
|
| {127, "red", 8000, 0, 1, 0},
|
| #endif
|
| @@ -154,10 +157,14 @@ const ACMCodecDB::CodecSettings ACMCodecDB::codec_settings_[] = {
|
| {1, {240}, 240, 1},
|
| {1, {480}, 480, 1},
|
| {1, {960}, 960, 1},
|
| +// TODO(solenberg): What is this flag? It is never set in the build files.
|
| #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
|
| @@ -204,6 +211,9 @@ const NetEqDecoder ACMCodecDB::neteq_decoders_[] = {
|
| NetEqDecoder::kDecoderCNGswb48kHz,
|
| #endif
|
| NetEqDecoder::kDecoderAVT,
|
| + NetEqDecoder::kDecoderAVT16kHz,
|
| + NetEqDecoder::kDecoderAVT32kHz,
|
| + NetEqDecoder::kDecoderAVT48kHz,
|
| #ifdef WEBRTC_CODEC_RED
|
| NetEqDecoder::kDecoderRED,
|
| #endif
|
|
|