Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Unified Diff: webrtc/modules/audio_processing/aec3/main_filter_update_gain_unittest.cc

Issue 2808513003: Add SafeClamp(), which accepts args of different types (Closed)
Patch Set: rebase Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_processing/aec3/main_filter_update_gain_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/main_filter_update_gain_unittest.cc b/webrtc/modules/audio_processing/aec3/main_filter_update_gain_unittest.cc
index 2a4d4d65b9067b2c4ec9da246957559f6a9120a2..581856b03f56197bf9cbfd9a9ee60c717f53fc56 100644
--- a/webrtc/modules/audio_processing/aec3/main_filter_update_gain_unittest.cc
+++ b/webrtc/modules/audio_processing/aec3/main_filter_update_gain_unittest.cc
@@ -15,6 +15,7 @@
#include <string>
#include "webrtc/base/random.h"
+#include "webrtc/base/safe_minmax.h"
#include "webrtc/modules/audio_processing/aec3/adaptive_fir_filter.h"
#include "webrtc/modules/audio_processing/aec3/aec_state.h"
#include "webrtc/modules/audio_processing/aec3/render_buffer.h"
@@ -99,9 +100,8 @@ void RunFilterUpdateTest(int num_blocks_to_process,
std::transform(y.begin(), y.end(), s.begin() + kFftLengthBy2,
e_main.begin(),
[&](float a, float b) { return a - b * kScale; });
- std::for_each(e_main.begin(), e_main.end(), [](float& a) {
- a = std::max(std::min(a, 32767.0f), -32768.0f);
- });
+ std::for_each(e_main.begin(), e_main.end(),
+ [](float& a) { a = rtc::SafeClamp(a, -32768.f, 32767.f); });
fft.ZeroPaddedFft(e_main, &E_main);
// Apply the shadow filter.
@@ -110,9 +110,8 @@ void RunFilterUpdateTest(int num_blocks_to_process,
std::transform(y.begin(), y.end(), s.begin() + kFftLengthBy2,
e_shadow.begin(),
[&](float a, float b) { return a - b * kScale; });
- std::for_each(e_shadow.begin(), e_shadow.end(), [](float& a) {
- a = std::max(std::min(a, 32767.0f), -32768.0f);
- });
+ std::for_each(e_shadow.begin(), e_shadow.end(),
+ [](float& a) { a = rtc::SafeClamp(a, -32768.f, 32767.f); });
fft.ZeroPaddedFft(e_shadow, &E_shadow);
// Compute spectra for future use.

Powered by Google App Engine
This is Rietveld 408576698