Convert CNG into C++ and remove it from AudioDecoder

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 "webrtc/base/checks.h"
-#include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h"
 #include "webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h"
 #ifdef WEBRTC_CODEC_G722
 #include "webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h"
 #endif
 #ifdef WEBRTC_CODEC_ILBC
 #include "webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h"
 #endif
 #ifdef WEBRTC_CODEC_ISACFX
 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h"
 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h"
 #endif
 #ifdef WEBRTC_CODEC_ISAC
 #include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h"
 #include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h"
 #endif
 #ifdef WEBRTC_CODEC_OPUS
 #include "webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h"
 #endif
 #include "webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h"
 
 namespace webrtc {
 
-AudioDecoderCng::AudioDecoderCng() {
-  RTC_CHECK_EQ(0, WebRtcCng_CreateDec(&dec_state_));
-  WebRtcCng_InitDec(dec_state_);
-}
-
-AudioDecoderCng::~AudioDecoderCng() {
-  WebRtcCng_FreeDec(dec_state_);
-}
-
-void AudioDecoderCng::Reset() {
-  WebRtcCng_InitDec(dec_state_);
-}
-
-int AudioDecoderCng::IncomingPacket(const uint8_t* payload,
-                                    size_t payload_len,
-                                    uint16_t rtp_sequence_number,
-                                    uint32_t rtp_timestamp,
-                                    uint32_t arrival_timestamp) {
-  return -1;
-}
-
-CNG_dec_inst* AudioDecoderCng::CngDecoderInstance() {
-  return dec_state_;
-}
-
-size_t AudioDecoderCng::Channels() const {
-  return 1;
-}
-
-int AudioDecoderCng::DecodeInternal(const uint8_t* encoded,
-                                    size_t encoded_len,
-                                    int sample_rate_hz,
-                                    int16_t* decoded,
-                                    SpeechType* speech_type) {
-  return -1;
-}
-
 bool CodecSupported(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
 #if defined(WEBRTC_CODEC_ISACFX) || defined(WEBRTC_CODEC_ISAC)
@@ skipping 135 matching lines @@
 #ifdef WEBRTC_CODEC_OPUS
     case NetEqDecoder::kDecoderOpus:
       return new AudioDecoderOpus(1);
     case NetEqDecoder::kDecoderOpus_2ch:
       return new AudioDecoderOpus(2);
 #endif
     case NetEqDecoder::kDecoderCNGnb:
     case NetEqDecoder::kDecoderCNGwb:
     case NetEqDecoder::kDecoderCNGswb32kHz:
     case NetEqDecoder::kDecoderCNGswb48kHz:
-      return new AudioDecoderCng;
+      RTC_CHECK(false) << "CNG should not be created like this anymore!";
     case NetEqDecoder::kDecoderRED:
     case NetEqDecoder::kDecoderAVT:
     case NetEqDecoder::kDecoderArbitrary:
     default: {
       return NULL;
     }
   }
 }
 
 }  // namespace webrtc