Simple cleanups of AudioDecoder and AudioEncoder classes

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 165 matching lines @@
     }
   }
 }
 
 AudioDecoder* CreateAudioDecoder(NetEqDecoder codec_type) {
   if (!CodecSupported(codec_type)) {
     return NULL;
   }
   switch (codec_type) {
     case kDecoderPCMu:
-      return new AudioDecoderPcmU;
+      return new AudioDecoderPcmU(1);
     case kDecoderPCMa:
-      return new AudioDecoderPcmA;
+      return new AudioDecoderPcmA(1);
     case kDecoderPCMu_2ch:
-      return new AudioDecoderPcmUMultiCh(2);
+      return new AudioDecoderPcmU(2);
     case kDecoderPCMa_2ch:
-      return new AudioDecoderPcmAMultiCh(2);
+      return new AudioDecoderPcmA(2);
 #ifdef WEBRTC_CODEC_ILBC
     case kDecoderILBC:
       return new AudioDecoderIlbc;
 #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
     case kDecoderPCM16B:
     case kDecoderPCM16Bwb:
     case kDecoderPCM16Bswb32kHz:
     case kDecoderPCM16Bswb48kHz:
-      return new AudioDecoderPcm16B;
+      return new AudioDecoderPcm16B(1);
     case kDecoderPCM16B_2ch:
     case kDecoderPCM16Bwb_2ch:
     case kDecoderPCM16Bswb32kHz_2ch:
     case kDecoderPCM16Bswb48kHz_2ch:
-      return new AudioDecoderPcm16BMultiCh(2);
+      return new AudioDecoderPcm16B(2);
     case kDecoderPCM16B_5ch:
-      return new AudioDecoderPcm16BMultiCh(5);
+      return new AudioDecoderPcm16B(5);
 #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