Convert CNG into C++ and remove it from AudioDecoder

webrtc/modules/audio_coding/neteq/comfort_noise.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 11 matching lines @@
 namespace webrtc {
 
 void ComfortNoise::Reset() {
   first_call_ = true;
   internal_error_code_ = 0;
 }
 
 int ComfortNoise::UpdateParameters(Packet* packet) {
   assert(packet);  // Existence is verified by caller.
   // Get comfort noise decoder.
-  AudioDecoder* cng_decoder = decoder_database_->GetDecoder(
-      packet->header.payloadType);
-  if (!cng_decoder) {
+  if (decoder_database_->SetActiveCngDecoder(packet->header.payloadType)
+      != kOK) {
     delete [] packet->payload;
     delete packet;
     return kUnknownPayloadType;
   }
-  decoder_database_->SetActiveCngDecoder(packet->header.payloadType);
-  CNG_dec_inst* cng_inst = cng_decoder->CngDecoderInstance();
+  CNG_dec_inst* cng_inst = decoder_database_->GetActiveCngDecoder();
   int16_t ret = WebRtcCng_UpdateSid(cng_inst,
                                     packet->payload,
                                     packet->payload_length);
   delete [] packet->payload;
   delete packet;
   if (ret < 0) {
     internal_error_code_ = WebRtcCng_GetErrorCodeDec(cng_inst);
     LOG(LS_ERROR) << "WebRtcCng_UpdateSid produced " << internal_error_code_;
     return kInternalError;
   }
@@ skipping 13 matching lines @@
 
   size_t number_of_samples = requested_length;
   int16_t new_period = 0;
   if (first_call_) {
     // Generate noise and overlap slightly with old data.
     number_of_samples = requested_length + overlap_length_;
     new_period = 1;
   }
   output->AssertSize(number_of_samples);
   // Get the decoder from the database.
-  AudioDecoder* cng_decoder = decoder_database_->GetActiveCngDecoder();
-  if (!cng_decoder) {
+  CNG_dec_inst* cng_inst = decoder_database_->GetActiveCngDecoder();
+  if (!cng_inst) {
     LOG(LS_ERROR) << "Unknwown payload type";
     return kUnknownPayloadType;
   }
-  CNG_dec_inst* cng_inst = cng_decoder->CngDecoderInstance();
   // The expression &(*output)[0][0] is a pointer to the first element in
   // the first channel.
   if (WebRtcCng_Generate(cng_inst, &(*output)[0][0], number_of_samples,
                          new_period) < 0) {
     // Error returned.
     output->Zeros(requested_length);
     internal_error_code_ = WebRtcCng_GetErrorCodeDec(cng_inst);
     LOG(LS_ERROR) << "WebRtcCng_Generate produced " << internal_error_code_;
     return kInternalError;
   }
@@ skipping 40 matching lines @@
     }
     // Remove |overlap_length_| samples from the front of |output| since they
     // were mixed into |sync_buffer_| above.
     output->PopFront(overlap_length_);
   }
   first_call_ = false;
   return kOK;
 }
 
 }  // namespace webrtc