Index: webrtc/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc |
diff --git a/webrtc/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc b/webrtc/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc |
index 4560958bfd0ef350e46d97a5a3ddcb34484627d0..2ecbc4d1bedcb52efee616f9dadbb1effa8ef9cf 100644 |
--- a/webrtc/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc |
+++ b/webrtc/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc |
@@ -20,6 +20,7 @@ |
#endif |
#include "webrtc/base/arraysize.h" |
#include "webrtc/base/random.h" |
+#include "webrtc/base/safe_minmax.h" |
#include "webrtc/modules/audio_processing/aec3/aec3_fft.h" |
#include "webrtc/modules/audio_processing/aec3/aec_state.h" |
#include "webrtc/modules/audio_processing/aec3/cascaded_biquad_filter.h" |
@@ -351,7 +352,7 @@ TEST(AdaptiveFirFilter, FilterAndAdapt) { |
std::transform(y.begin(), y.end(), s.begin() + kFftLengthBy2, e.begin(), |
[&](float a, float b) { return a - b * kScale; }); |
std::for_each(e.begin(), e.end(), [](float& a) { |
- a = std::max(std::min(a, 32767.0f), -32768.0f); |
+ a = rtc::SafeClamp<float>(a, -32768.f, 32767.f); |
ossu
2017/06/12 12:21:36
Why does this one need an explicit return type? Lo
kwiberg-webrtc
2017/06/12 17:28:12
Done.
|
}); |
fft.ZeroPaddedFft(e, &E); |