Returning correct duration estimate on Opus DTX packets.

webrtc/modules/audio_coding/neteq/neteq_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 1627 matching lines @@
     decoder_error_code_ = comfort_noise_->internal_error_code();
     return kComfortNoiseErrorCode;
   } else if (cn_return == ComfortNoise::kUnknownPayloadType) {
     return kUnknownRtpPayloadType;
   }
   return 0;
 }
 
 void NetEqImpl::DoCodecInternalCng() {
   int length = 0;
-  // TODO(hlundin): Will probably need a longer buffer for multi-channel.
-  int16_t decoded_buffer[kMaxFrameSize];
   AudioDecoder* decoder = decoder_database_->GetActiveDecoder();
   if (decoder) {
     const uint8_t* dummy_payload = NULL;
     AudioDecoder::SpeechType speech_type;
     length = decoder->Decode(
-        dummy_payload, 0, fs_hz_, kMaxFrameSize * sizeof(int16_t),
-        decoded_buffer, &speech_type);
+        dummy_payload, 0, fs_hz_, decoded_buffer_length_ * sizeof(int16_t),
+        decoded_buffer_.get(), &speech_type);
   }
   assert(mute_factor_array_.get());
-  normal_->Process(decoded_buffer, length, last_mode_, mute_factor_array_.get(),
-                   algorithm_buffer_.get());
-  last_mode_ = kModeCodecInternalCng;
-  expand_->Reset();
+  if (length > 0) {

[hlundin-webrtc, 2015/09/15 13:05:09]

I think you'll have to handle the error differently. If the decoder returns an
error, we should probably set the output to zero; use decoder_frame_length_ as
default packet size. And then call normal_->Process anyway. But, it is still
good to LOG.

[minyue-webrtc, 2015/09/16 08:05:31]

May I suggest yet another solution? When normal decoding fails, it uses
expansion, see line 1255.
*operation = kExpand;  // Do expansion to get data instead.

I think DoCodecInternalCng belongs there. I gave myself an action item of moving
these lines into Decode() (or DecodeLoop). I did not apply it since I wanted to
make a quick fix. Maybe good to do it. WDYT

+    normal_->Process(decoded_buffer_.get(), length, last_mode_,
+                     mute_factor_array_.get(), algorithm_buffer_.get());
+    last_mode_ = kModeCodecInternalCng;
+    expand_->Reset();
+  } else {
+    LOG(LS_WARNING) << "Codec internal Cng decode error.";
+  }
 }
 
 int NetEqImpl::DoDtmf(const DtmfEvent& dtmf_event, bool* play_dtmf) {
   // This block of the code and the block further down, handling |dtmf_switch|
   // are commented out. Otherwise playing out-of-band DTMF would fail in VoE
   // test, DtmfTest.ManualSuccessfullySendsOutOfBandTelephoneEvents. This is
   // equivalent to |dtmf_switch| always be false.
   //
   // See http://webrtc-codereview.appspot.com/1195004/ for discussion
   // On this issue. This change might cause some glitches at the point of
@@ skipping 320 matching lines @@
 
 void NetEqImpl::CreateDecisionLogic() {
   decision_logic_.reset(DecisionLogic::Create(fs_hz_, output_size_samples_,
                                               playout_mode_,
                                               decoder_database_.get(),
                                               *packet_buffer_.get(),
                                               delay_manager_.get(),
                                               buffer_level_filter_.get()));
 }
 }  // namespace webrtc