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.
  */
 
 #include "webrtc/modules/audio_coding/neteq/comfort_noise.h"
 
 #include <assert.h>
 
 #include "webrtc/base/logging.h"
 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
-#include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h"
 #include "webrtc/modules/audio_coding/neteq/decoder_database.h"
 #include "webrtc/modules/audio_coding/neteq/dsp_helper.h"
 #include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
 
 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();
-  int16_t ret = WebRtcCng_UpdateSid(cng_inst,
-                                    packet->payload,
-                                    packet->payload_length);
+  ComfortNoiseDecoder* cng_decoder = decoder_database_->GetActiveCngDecoder();
+  cng_decoder->UpdateSid(rtc::ArrayView<const uint8_t>(
+      packet->payload, packet->payload_length));

[kwiberg-webrtc, 2016/04/12 13:35:31]

You probably don't need to store the cng decoder in a variable here, since the
return value is never null. (Hmm. That function can return null. I guess it will
never do so in this case?)

[ossu, 2016/04/12 13:54:50]

Yeah, it can but it never will. RTC_DCHECK?
It's going to be a long, ugly line if I combine them, though.

[hlundin-webrtc, 2016/04/13 07:05:24]

I vote for a DCHECK.

[ossu, 2016/04/13 11:57:07]

Acknowledged.

   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;
-  }
   return kOK;
 }
 
 int ComfortNoise::Generate(size_t requested_length,
                            AudioMultiVector* output) {
   // TODO(hlundin): Change to an enumerator and skip assert.
   assert(fs_hz_ == 8000 || fs_hz_ == 16000 || fs_hz_ ==  32000 ||
          fs_hz_ == 48000);
   // Not adapted for multi-channel yet.
   if (output->Channels() != 1) {
     LOG(LS_ERROR) << "No multi-channel support";
     return kMultiChannelNotSupported;
   }
 
   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();
+  ComfortNoiseDecoder* cng_decoder = decoder_database_->GetActiveCngDecoder();
   if (!cng_decoder) {
     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) {
+  if (!cng_decoder->Generate(
+          rtc::ArrayView<int16_t>(&(*output)[0][0], number_of_samples),
+          new_period)) {
     // Error returned.
     output->Zeros(requested_length);
-    internal_error_code_ = WebRtcCng_GetErrorCodeDec(cng_inst);
-    LOG(LS_ERROR) << "WebRtcCng_Generate produced " << internal_error_code_;
+    LOG(LS_ERROR) <<
+        "ComfortNoiseDecoder::Genererate failed to generate comfort noise";
     return kInternalError;
   }
 
   if (first_call_) {
     // Set tapering window parameters. Values are in Q15.
     int16_t muting_window;  // Mixing factor for overlap data.
     int16_t muting_window_increment;  // Mixing factor increment (negative).
     int16_t unmuting_window;  // Mixing factor for comfort noise.
     int16_t unmuting_window_increment;  // Mixing factor increment.
     if (fs_hz_ == 8000) {
@@ skipping 32 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