Add SafeClamp(), which accepts args of different types

webrtc/modules/audio_processing/intelligibility/intelligibility_utils.cc

 /*
  *  Copyright (c) 2014 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_processing/intelligibility/intelligibility_utils.h"
 
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
 #include <algorithm>
 #include <limits>
 
+#include "webrtc/base/safe_minmax.h"
+
 namespace webrtc {
 
 namespace intelligibility {
 
 namespace {
 
 const float kMinFactor = 0.01f;
 const float kMaxFactor = 100.f;
 
 // Return |current| changed towards |target|, with the relative change being at
 // most |limit|.
 float UpdateFactor(float target, float current, float limit) {
-  float gain = target / (current + std::numeric_limits<float>::epsilon());
-  gain = std::min(std::max(gain, 1.f - limit), 1.f + limit);
-  return std::min(std::max(current * gain, kMinFactor), kMaxFactor);;
+  const float gain = target / (current + std::numeric_limits<float>::epsilon());
+  const float clamped_gain = rtc::SafeClamp(gain, 1 - limit, 1 + limit);
+  return rtc::SafeClamp(current * clamped_gain, kMinFactor, kMaxFactor);
 }
 
 }  // namespace
 
 template<typename T>
 PowerEstimator<T>::PowerEstimator(size_t num_freqs, float decay)
     : power_(num_freqs, 0.f), decay_(decay) {}
 
 template<typename T>
 void PowerEstimator<T>::Step(const T* data) {
@@ skipping 39 matching lines @@
         sample_index = 0u;
       }
     }
   }
   read_index_ = sample_index;
 }
 
 }  // namespace intelligibility
 
 }  // namespace webrtc