Move AudioDecoderPcm16B next to AudioEncoderPcm16B

webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc

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 a96702156f8a185975b4be7cb4ab15e3975778ba..892555049ffc796b5e0dd2cb0428cbf13dc01ddf 100644
--- a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc
+++ b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc
@@ -31,7 +31,7 @@
 #ifdef WEBRTC_CODEC_OPUS
 #include "webrtc/modules/audio_coding/codecs/opus/interface/audio_decoder_opus.h"
 #endif
-#include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h"
+#include "webrtc/modules/audio_coding/codecs/pcm16b/include/audio_decoder_pcm16b.h"
 
 namespace webrtc {
 
@@ -95,43 +95,6 @@ size_t AudioDecoderPcmAMultiCh::Channels() const {
   return channels_;
 }
 
-// PCM16B
-AudioDecoderPcm16B::AudioDecoderPcm16B() {}
-
-void AudioDecoderPcm16B::Reset() {
-}
-size_t AudioDecoderPcm16B::Channels() const {
-  return 1;
-}
-
-int AudioDecoderPcm16B::DecodeInternal(const uint8_t* encoded,
-                                       size_t encoded_len,
-                                       int sample_rate_hz,
-                                       int16_t* decoded,
-                                       SpeechType* speech_type) {
-  DCHECK(sample_rate_hz == 8000 || sample_rate_hz == 16000 ||
-         sample_rate_hz == 32000 || sample_rate_hz == 48000)
-      << "Unsupported sample rate " << sample_rate_hz;
-  size_t ret = WebRtcPcm16b_Decode(encoded, encoded_len, decoded);
-  *speech_type = ConvertSpeechType(1);
-  return static_cast<int>(ret);
-}
-
-int AudioDecoderPcm16B::PacketDuration(const uint8_t* encoded,
-                                       size_t encoded_len) const {
-  // Two encoded byte per sample per channel.
-  return static_cast<int>(encoded_len / (2 * Channels()));
-}
-
-AudioDecoderPcm16BMultiCh::AudioDecoderPcm16BMultiCh(size_t num_channels)
-    : channels_(num_channels) {
-  DCHECK(num_channels > 0);
-}
-
-size_t AudioDecoderPcm16BMultiCh::Channels() const {
-  return channels_;
-}
-
 // G.722
 #ifdef WEBRTC_CODEC_G722
 AudioDecoderG722::AudioDecoderG722() {