Remove the preprocessor symbol WEBRTC_CODEC_PCM16 (it was always defined)

webrtc/modules/audio_coding/neteq/audio_decoder_impl.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 13 matching lines @@
 #endif
 #ifdef WEBRTC_CODEC_ISACFX
 #include "webrtc/modules/audio_coding/codecs/isac/fix/interface/audio_encoder_isacfix.h"
 #endif
 #ifdef WEBRTC_CODEC_ISAC
 #include "webrtc/modules/audio_coding/codecs/isac/main/interface/audio_encoder_isac.h"
 #endif
 #ifdef WEBRTC_CODEC_OPUS
 #include "webrtc/modules/audio_coding/codecs/opus/interface/audio_decoder_opus.h"
 #endif
-#ifdef WEBRTC_CODEC_PCM16
 #include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h"
-#endif
 
 namespace webrtc {
 
 // PCMu
 
 void AudioDecoderPcmU::Reset() {
 }
 size_t AudioDecoderPcmU::Channels() const {
   return 1;
 }
@@ skipping 44 matching lines @@
                                      size_t encoded_len) const {
   // One encoded byte per sample per channel.
   return static_cast<int>(encoded_len / Channels());
 }
 
 size_t AudioDecoderPcmAMultiCh::Channels() const {
   return channels_;
 }
 
 // PCM16B
-#ifdef WEBRTC_CODEC_PCM16
 AudioDecoderPcm16B::AudioDecoderPcm16B() {}
 
 void AudioDecoderPcm16B::Reset() {
 }
 size_t AudioDecoderPcm16B::Channels() const {
   return 1;
 }
 
 int AudioDecoderPcm16B::DecodeInternal(const uint8_t* encoded,
                                        size_t encoded_len,
@@ skipping 15 matching lines @@
 }
 
 AudioDecoderPcm16BMultiCh::AudioDecoderPcm16BMultiCh(size_t num_channels)
     : channels_(num_channels) {
   DCHECK(num_channels > 0);
 }
 
 size_t AudioDecoderPcm16BMultiCh::Channels() const {
   return channels_;
 }
-#endif
 
 // iLBC
 #ifdef WEBRTC_CODEC_ILBC
 AudioDecoderIlbc::AudioDecoderIlbc() {
   WebRtcIlbcfix_DecoderCreate(&dec_state_);
   WebRtcIlbcfix_Decoderinit30Ms(dec_state_);
 }
 
 AudioDecoderIlbc::~AudioDecoderIlbc() {
   WebRtcIlbcfix_DecoderFree(dec_state_);
@@ skipping 197 matching lines @@
 #ifdef WEBRTC_CODEC_ILBC
     case kDecoderILBC:
 #endif
 #if defined(WEBRTC_CODEC_ISACFX) || defined(WEBRTC_CODEC_ISAC)
     case kDecoderISAC:
 #endif
 #ifdef WEBRTC_CODEC_ISAC
     case kDecoderISACswb:
     case kDecoderISACfb:
 #endif
-#ifdef WEBRTC_CODEC_PCM16
     case kDecoderPCM16B:
     case kDecoderPCM16Bwb:
     case kDecoderPCM16Bswb32kHz:
     case kDecoderPCM16Bswb48kHz:
     case kDecoderPCM16B_2ch:
     case kDecoderPCM16Bwb_2ch:
     case kDecoderPCM16Bswb32kHz_2ch:
     case kDecoderPCM16Bswb48kHz_2ch:
     case kDecoderPCM16B_5ch:
-#endif
 #ifdef WEBRTC_CODEC_G722
     case kDecoderG722:
     case kDecoderG722_2ch:
 #endif
 #ifdef WEBRTC_CODEC_OPUS
     case kDecoderOpus:
     case kDecoderOpus_2ch:
 #endif
     case kDecoderRED:
     case kDecoderAVT:
@@ skipping 12 matching lines @@
 
 int CodecSampleRateHz(NetEqDecoder codec_type) {
   switch (codec_type) {
     case kDecoderPCMu:
     case kDecoderPCMa:
     case kDecoderPCMu_2ch:
     case kDecoderPCMa_2ch:
 #ifdef WEBRTC_CODEC_ILBC
     case kDecoderILBC:
 #endif
-#ifdef WEBRTC_CODEC_PCM16
     case kDecoderPCM16B:
     case kDecoderPCM16B_2ch:
     case kDecoderPCM16B_5ch:
-#endif
     case kDecoderCNGnb: {
       return 8000;
     }
 #if defined(WEBRTC_CODEC_ISACFX) || defined(WEBRTC_CODEC_ISAC)
     case kDecoderISAC:
 #endif
-#ifdef WEBRTC_CODEC_PCM16
     case kDecoderPCM16Bwb:
     case kDecoderPCM16Bwb_2ch:
-#endif
 #ifdef WEBRTC_CODEC_G722
     case kDecoderG722:
     case kDecoderG722_2ch:
 #endif
     case kDecoderCNGwb: {
       return 16000;
     }
 #ifdef WEBRTC_CODEC_ISAC
     case kDecoderISACswb:
     case kDecoderISACfb:
 #endif
-#ifdef WEBRTC_CODEC_PCM16
     case kDecoderPCM16Bswb32kHz:
     case kDecoderPCM16Bswb32kHz_2ch:
-#endif
     case kDecoderCNGswb32kHz: {
       return 32000;
     }
-#ifdef WEBRTC_CODEC_PCM16
     case kDecoderPCM16Bswb48kHz:
     case kDecoderPCM16Bswb48kHz_2ch: {
       return 48000;
     }
-#endif
 #ifdef WEBRTC_CODEC_OPUS
     case kDecoderOpus:
     case kDecoderOpus_2ch: {
       return 48000;
     }
 #endif
     case kDecoderCNGswb48kHz: {
       // TODO(tlegrand): Remove limitation once ACM has full 48 kHz support.
       return 32000;
     }
@@ skipping 22 matching lines @@
 #endif
 #if defined(WEBRTC_CODEC_ISACFX)
     case kDecoderISAC:
       return new AudioDecoderIsacFix();
 #elif defined(WEBRTC_CODEC_ISAC)
     case kDecoderISAC:
     case kDecoderISACswb:
     case kDecoderISACfb:
       return new AudioDecoderIsac();
 #endif
-#ifdef WEBRTC_CODEC_PCM16
     case kDecoderPCM16B:
     case kDecoderPCM16Bwb:
     case kDecoderPCM16Bswb32kHz:
     case kDecoderPCM16Bswb48kHz:
       return new AudioDecoderPcm16B;
     case kDecoderPCM16B_2ch:
     case kDecoderPCM16Bwb_2ch:
     case kDecoderPCM16Bswb32kHz_2ch:
     case kDecoderPCM16Bswb48kHz_2ch:
       return new AudioDecoderPcm16BMultiCh(2);
     case kDecoderPCM16B_5ch:
       return new AudioDecoderPcm16BMultiCh(5);
-#endif
 #ifdef WEBRTC_CODEC_G722
     case kDecoderG722:
       return new AudioDecoderG722;
     case kDecoderG722_2ch:
       return new AudioDecoderG722Stereo;
 #endif
 #ifdef WEBRTC_CODEC_OPUS
     case kDecoderOpus:
       return new AudioDecoderOpus(1);
     case kDecoderOpus_2ch:
       return new AudioDecoderOpus(2);
 #endif
     case kDecoderCNGnb:
     case kDecoderCNGwb:
     case kDecoderCNGswb32kHz:
     case kDecoderCNGswb48kHz:
       return new AudioDecoderCng;
     case kDecoderRED:
     case kDecoderAVT:
     case kDecoderArbitrary:
     default: {
       return NULL;
     }
   }
 }
 
 }  // namespace webrtc