| Index: webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc
|
| diff --git a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc
|
| index 9f97c79a8a40fb5ddcc77b2f4a4bffe8f0078bd6..4abd369656b91e69f07fb08a22ccb4d75bb8b846 100644
|
| --- a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc
|
| +++ b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc
|
| @@ -39,7 +39,6 @@ const CodecInst ACMCodecDB::database_[] = {
|
| {105, "ISAC", 48000, kIsacPacSize1440, 1, kIsacSwbDefaultRate},
|
| # endif
|
| #endif
|
| -#ifdef WEBRTC_CODEC_PCM16
|
| // Mono
|
| {107, "L16", 8000, 80, 1, 128000},
|
| {108, "L16", 16000, 160, 1, 256000},
|
| @@ -48,7 +47,6 @@ const CodecInst ACMCodecDB::database_[] = {
|
| {111, "L16", 8000, 80, 2, 128000},
|
| {112, "L16", 16000, 160, 2, 256000},
|
| {113, "L16", 32000, 320, 2, 512000},
|
| -#endif
|
| // G.711, PCM mu-law and A-law.
|
| // Mono
|
| {0, "PCMU", 8000, 160, 1, 64000},
|
| @@ -99,7 +97,6 @@ const ACMCodecDB::CodecSettings ACMCodecDB::codec_settings_[] = {
|
| {1, {kIsacPacSize1440}, 0, 1, true},
|
| # endif
|
| #endif
|
| -#ifdef WEBRTC_CODEC_PCM16
|
| // Mono
|
| {4, {80, 160, 240, 320}, 0, 2, false},
|
| {4, {160, 320, 480, 640}, 0, 2, false},
|
| @@ -108,7 +105,6 @@ const ACMCodecDB::CodecSettings ACMCodecDB::codec_settings_[] = {
|
| {4, {80, 160, 240, 320}, 0, 2, false},
|
| {4, {160, 320, 480, 640}, 0, 2, false},
|
| {2, {320, 640}, 0, 2},
|
| -#endif
|
| // G.711, PCM mu-law and A-law.
|
| // Mono
|
| {6, {80, 160, 240, 320, 400, 480}, 0, 2, false},
|
| @@ -157,7 +153,6 @@ const NetEqDecoder ACMCodecDB::neteq_decoders_[] = {
|
| kDecoderISACfb,
|
| # endif
|
| #endif
|
| -#ifdef WEBRTC_CODEC_PCM16
|
| // Mono
|
| kDecoderPCM16B,
|
| kDecoderPCM16Bwb,
|
| @@ -166,7 +161,6 @@ const NetEqDecoder ACMCodecDB::neteq_decoders_[] = {
|
| kDecoderPCM16B_2ch,
|
| kDecoderPCM16Bwb_2ch,
|
| kDecoderPCM16Bswb32kHz_2ch,
|
| -#endif
|
| // G.711, PCM mu-las and A-law.
|
| // Mono
|
| kDecoderPCMu,
|
|
|