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.
  */
 
@@ skipping 18 matching lines @@
 #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 right now!");

[kwiberg-webrtc, 2016/04/09 07:34:49]

RTC_CHECK(false) << "CNG should not be created like this right now!";

[ossu, 2016/04/11 08:31:10]

Acknowledged.

[hlundin-webrtc, 2016/04/11 11:33:00]

I guess RTC_NOTREACHED() is yet another way to say it.

I think you should drop the "right now", since I think we want to keep CNG
outside of the AudioDecoder interface.

[kwiberg-webrtc, 2016/04/11 12:42:56]

Yes, but bear in mind that that one uses DCHECK, not CHECK. (Hmm. Perhaps it
ought to use CHECK instead? Since the line should never be reached, there won't
be any overhead... hmm... except that the compiler could optimize based on our
assertion... need to think more about this.)

[ossu, 2016/04/11 12:59:57]

It makes sense that NOTREACHED should be in even in release builds. As you say,
since it should _never_ happen, its cost (except in code size) shouldn't matter.
I'll keep it as RTC_CHECK(false) until this is resolved, though.

[ossu, 2016/04/11 12:59:57]

Acknowledged.

[kwiberg-webrtc, 2016/04/11 13:28:26]

Yes. Except that the compiler can optimize the surrounding code based on our
assertion that this statement can't be reached.
Good.

     case NetEqDecoder::kDecoderRED:
     case NetEqDecoder::kDecoderAVT:
     case NetEqDecoder::kDecoderArbitrary:
     default: {
       return NULL;
     }
   }
 }
 
 }  // namespace webrtc