NetEq: Fix a bug in expand_rate and speech_expand_rate calculation

webrtc/modules/audio_coding/neteq/statistics_calculator.cc

 /*
  *  Copyright (c) 2013 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/statistics_calculator.h"
 
 #include <assert.h>
 #include <string.h>  // memset
 #include <algorithm>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/safe_conversions.h"
 #include "webrtc/modules/audio_coding/neteq/decision_logic.h"
 #include "webrtc/modules/audio_coding/neteq/delay_manager.h"
 #include "webrtc/system_wrappers/include/metrics.h"
 
 namespace webrtc {
 
+namespace {
+size_t AddIntToSizeTWithLowerCap(int a, size_t b) {
+  if (a < 0 && static_cast<size_t>(-a) > b) {

[kwiberg-webrtc, 2017/05/04 19:55:04]

if (safe_cmp::Gt(-a, b)) {

Both your and my version will misbehave if a == INT_MIN, though, so maybe

if (safe_cmp::Gt(-int64_t{a}, b)) {

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

how about

size_t ret = b + a; // you may cast a if you want
return (a < 0 && ret > b) ? 0 : ret
  

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

Is it conceivable that abs(int_min) is larger than max(size_t) on any platform?
That would break Minyue's proposal. Otherwise, I like it.

I implemented Karl's suggestion for now. Let me know if you think I should
change.

[kwiberg-webrtc, 2017/05/05 08:34:29]

AFAICT, the standard just says that "The type size_t is an
implementation-defined unsigned integer type that is large enough to contain the
size in bytes of any object." But I doubt there's any system whose size_t is
smaller than int. You could static_assert it if you want.
Yes, I like it too---it makes neat use of the fact that signed-to-unsigned
conversion is well-defined (which is not the case for unsigned-to-signed
conversion).
Minyue's version is probably better, since it avoids using 64-bit types on
32-bit platforms.

[hlundin-webrtc, 2017/05/05 11:40:09]

Changed to Minyue's version.

+    // Simply doing a + b would give a negative result, with a negative wrap.
+    // Cap it to zero instead.
+    return 0;
+  }
+  return a + b;

[kwiberg-webrtc, 2017/05/04 19:55:04]

I'm pretty sure a will be promoted to size_t before the addition so that
everything just works, but consider making it explicit:

  return dchecked_cast<size_t>(a) + b;

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

Done.

+}
+}
+
 // Allocating the static const so that it can be passed by reference to
 // RTC_DCHECK.
 const size_t StatisticsCalculator::kLenWaitingTimes;
 
 StatisticsCalculator::PeriodicUmaLogger::PeriodicUmaLogger(
     const std::string& uma_name,
     int report_interval_ms,
     int max_value)
     : uma_name_(uma_name),
       report_interval_ms_(report_interval_ms),
@@ skipping 106 matching lines @@
 }
 
 void StatisticsCalculator::ExpandedVoiceSamples(size_t num_samples) {
   expanded_speech_samples_ += num_samples;
 }
 
 void StatisticsCalculator::ExpandedNoiseSamples(size_t num_samples) {
   expanded_noise_samples_ += num_samples;
 }
 
+void StatisticsCalculator::ExpandedVoiceSamplesCorrection(int num_samples) {
+  expanded_speech_samples_ =
+      AddIntToSizeTWithLowerCap(num_samples, expanded_speech_samples_);
+}
+
+void StatisticsCalculator::ExpandedNoiseSamplesCorrection(int num_samples) {
+  expanded_noise_samples_ =
+      AddIntToSizeTWithLowerCap(num_samples, expanded_noise_samples_);
+}
+
 void StatisticsCalculator::PreemptiveExpandedSamples(size_t num_samples) {
   preemptive_samples_ += num_samples;
 }
 
 void StatisticsCalculator::AcceleratedSamples(size_t num_samples) {
   accelerate_samples_ += num_samples;
 }
 
 void StatisticsCalculator::AddZeros(size_t num_samples) {
   added_zero_samples_ += num_samples;
@@ skipping 127 matching lines @@
     // Ratio must be smaller than 1 in Q14.
     assert((numerator << 14) / denominator < (1 << 14));
     return static_cast<uint16_t>((numerator << 14) / denominator);
   } else {
     // Will not produce a ratio larger than 1, since this is probably an error.
     return 1 << 14;
   }
 }
 
 }  // namespace webrtc