| Index: webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc
|
| diff --git a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc
|
| index 762c3859837172f0e151966c01267c089e0c91a7..b3f307fa1506d56dbed5940674181a7b70a3b5a2 100644
|
| --- a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc
|
| +++ b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc
|
| @@ -82,59 +82,4 @@ bool CodecSupported(NetEqDecoder codec_type) {
|
| }
|
| }
|
|
|
| -int CodecSampleRateHz(NetEqDecoder codec_type) {
|
| - switch (codec_type) {
|
| - case NetEqDecoder::kDecoderPCMu:
|
| - case NetEqDecoder::kDecoderPCMa:
|
| - case NetEqDecoder::kDecoderPCMu_2ch:
|
| - case NetEqDecoder::kDecoderPCMa_2ch:
|
| -#ifdef WEBRTC_CODEC_ILBC
|
| - case NetEqDecoder::kDecoderILBC:
|
| -#endif
|
| - case NetEqDecoder::kDecoderPCM16B:
|
| - case NetEqDecoder::kDecoderPCM16B_2ch:
|
| - case NetEqDecoder::kDecoderPCM16B_5ch:
|
| - case NetEqDecoder::kDecoderCNGnb: {
|
| - return 8000;
|
| - }
|
| -#if defined(WEBRTC_CODEC_ISACFX) || defined(WEBRTC_CODEC_ISAC)
|
| - case NetEqDecoder::kDecoderISAC:
|
| -#endif
|
| - case NetEqDecoder::kDecoderPCM16Bwb:
|
| - case NetEqDecoder::kDecoderPCM16Bwb_2ch:
|
| -#ifdef WEBRTC_CODEC_G722
|
| - case NetEqDecoder::kDecoderG722:
|
| - case NetEqDecoder::kDecoderG722_2ch:
|
| -#endif
|
| - case NetEqDecoder::kDecoderCNGwb: {
|
| - return 16000;
|
| - }
|
| -#ifdef WEBRTC_CODEC_ISAC
|
| - case NetEqDecoder::kDecoderISACswb:
|
| -#endif
|
| - case NetEqDecoder::kDecoderPCM16Bswb32kHz:
|
| - case NetEqDecoder::kDecoderPCM16Bswb32kHz_2ch:
|
| - case NetEqDecoder::kDecoderCNGswb32kHz: {
|
| - return 32000;
|
| - }
|
| - case NetEqDecoder::kDecoderPCM16Bswb48kHz:
|
| - case NetEqDecoder::kDecoderPCM16Bswb48kHz_2ch: {
|
| - return 48000;
|
| - }
|
| -#ifdef WEBRTC_CODEC_OPUS
|
| - case NetEqDecoder::kDecoderOpus:
|
| - case NetEqDecoder::kDecoderOpus_2ch: {
|
| - return 48000;
|
| - }
|
| -#endif
|
| - case NetEqDecoder::kDecoderCNGswb48kHz: {
|
| - // TODO(tlegrand): Remove limitation once ACM has full 48 kHz support.
|
| - return 32000;
|
| - }
|
| - default: {
|
| - return -1; // Undefined sample rate.
|
| - }
|
| - }
|
| -}
|
| -
|
| } // namespace webrtc
|
|
|