NetEq: Fix a bug in expand_rate and speech_expand_rate calculation

webrtc/modules/audio_coding/neteq/merge.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 136 matching lines @@
       output->AssertSize(output_length);
     } else {
       assert(output->Size() == output_length);
     }
     (*output)[channel].OverwriteAt(temp_data_.data(), output_length, 0);
   }
 
   // Copy back the first part of the data to |sync_buffer_| and remove it from
   // |output|.
   sync_buffer_->ReplaceAtIndex(*output, old_length, sync_buffer_->next_index());
+  RTC_DCHECK_EQ(output_length, output->Size());

[minyue-webrtc, 2017/05/05 07:14:00]

I don't quite see how this relates to the changes in stats.

[hlundin-webrtc, 2017/05/05 07:42:14]

I basically just wanted to make sure that the return value from this function
would never go negative (which would cause a wrap). I'll reduce to a single
DCHECK.

[minyue-webrtc, 2017/05/05 07:50:39]

Acknowledged.

+  RTC_DCHECK_GE(output_length, old_length);
   output->PopFront(old_length);
+  RTC_DCHECK_EQ(output_length - old_length, output->Size());
 
   // Return new added length. |old_length| samples were borrowed from
   // |sync_buffer_|.
   return output_length - old_length;
 }
 
 size_t Merge::GetExpandedSignal(size_t* old_length, size_t* expand_period) {
   // Check how much data that is left since earlier.
   *old_length = sync_buffer_->FutureLength();
   // Should never be less than overlap_length.
@@ skipping 203 matching lines @@
   }
   return best_correlation_index;
 }
 
 size_t Merge::RequiredFutureSamples() {
   return fs_hz_ / 100 * num_channels_;  // 10 ms.
 }
 
 
 }  // namespace webrtc