Move AudioDecoderIlbc next to AudioEncoderIlbc

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.
  */
 
 #include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h"
 
 #include <assert.h>
 #include <string.h>  // memmove
 
 #include "webrtc/base/checks.h"
 #include "webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h"
 #include "webrtc/modules/audio_coding/codecs/g711/include/g711_interface.h"
 #ifdef WEBRTC_CODEC_G722
 #include "webrtc/modules/audio_coding/codecs/g722/include/g722_interface.h"
 #endif
 #ifdef WEBRTC_CODEC_ILBC
-#include "webrtc/modules/audio_coding/codecs/ilbc/interface/ilbc.h"
+#include "webrtc/modules/audio_coding/codecs/ilbc/interface/audio_decoder_ilbc.h"
 #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
@@ skipping 91 matching lines @@
 
 AudioDecoderPcm16BMultiCh::AudioDecoderPcm16BMultiCh(size_t num_channels)
     : channels_(num_channels) {
   DCHECK(num_channels > 0);
 }
 
 size_t AudioDecoderPcm16BMultiCh::Channels() const {
   return channels_;
 }
 
-// iLBC
-#ifdef WEBRTC_CODEC_ILBC
-AudioDecoderIlbc::AudioDecoderIlbc() {
-  WebRtcIlbcfix_DecoderCreate(&dec_state_);
-  WebRtcIlbcfix_Decoderinit30Ms(dec_state_);
-}
-
-AudioDecoderIlbc::~AudioDecoderIlbc() {
-  WebRtcIlbcfix_DecoderFree(dec_state_);
-}
-
-bool AudioDecoderIlbc::HasDecodePlc() const {
-  return true;
-}
-
-int AudioDecoderIlbc::DecodeInternal(const uint8_t* encoded,
-                                     size_t encoded_len,
-                                     int sample_rate_hz,
-                                     int16_t* decoded,
-                                     SpeechType* speech_type) {
-  DCHECK_EQ(sample_rate_hz, 8000);
-  int16_t temp_type = 1;  // Default is speech.
-  int ret = WebRtcIlbcfix_Decode(dec_state_, encoded, encoded_len, decoded,
-                                 &temp_type);
-  *speech_type = ConvertSpeechType(temp_type);
-  return ret;
-}
-
-size_t AudioDecoderIlbc::DecodePlc(size_t num_frames, int16_t* decoded) {
-  return WebRtcIlbcfix_NetEqPlc(dec_state_, decoded, num_frames);
-}
-
-void AudioDecoderIlbc::Reset() {
-  WebRtcIlbcfix_Decoderinit30Ms(dec_state_);
-}
-
-size_t AudioDecoderIlbc::Channels() const {
-  return 1;
-}
-#endif
-
 // G.722
 #ifdef WEBRTC_CODEC_G722
 AudioDecoderG722::AudioDecoderG722() {
   WebRtcG722_CreateDecoder(&dec_state_);
   WebRtcG722_DecoderInit(dec_state_);
 }
 
 AudioDecoderG722::~AudioDecoderG722() {
   WebRtcG722_FreeDecoder(dec_state_);
 }
@@ skipping 308 matching lines @@
     case kDecoderRED:
     case kDecoderAVT:
     case kDecoderArbitrary:
     default: {
       return NULL;
     }
   }
 }
 
 }  // namespace webrtc