| Index: webrtc/modules/audio_processing/aec/aec_core_sse2.cc
|
| diff --git a/webrtc/modules/audio_processing/aec/aec_core_sse2.cc b/webrtc/modules/audio_processing/aec/aec_core_sse2.cc
|
| index 254dbf10e337e25fb55f0ded57ebce003a4c7406..8fa0166ea16e6f3147f3295547d8e56d37d536a9 100644
|
| --- a/webrtc/modules/audio_processing/aec/aec_core_sse2.cc
|
| +++ b/webrtc/modules/audio_processing/aec/aec_core_sse2.cc
|
| @@ -79,17 +79,13 @@ static void FilterFarSSE2(int num_partitions,
|
| }
|
| }
|
|
|
| -static void ScaleErrorSignalSSE2(int extended_filter_enabled,
|
| - float normal_mu,
|
| - float normal_error_threshold,
|
| +static void ScaleErrorSignalSSE2(float mu,
|
| + float error_threshold,
|
| float x_pow[PART_LEN1],
|
| float ef[2][PART_LEN1]) {
|
| const __m128 k1e_10f = _mm_set1_ps(1e-10f);
|
| - const __m128 kMu = extended_filter_enabled ? _mm_set1_ps(kExtendedMu)
|
| - : _mm_set1_ps(normal_mu);
|
| - const __m128 kThresh = extended_filter_enabled
|
| - ? _mm_set1_ps(kExtendedErrorThreshold)
|
| - : _mm_set1_ps(normal_error_threshold);
|
| + const __m128 kMu = _mm_set1_ps(mu);
|
| + const __m128 kThresh = _mm_set1_ps(error_threshold);
|
|
|
| int i;
|
| // vectorized code (four at once)
|
| @@ -124,10 +120,6 @@ static void ScaleErrorSignalSSE2(int extended_filter_enabled,
|
| }
|
| // scalar code for the remaining items.
|
| {
|
| - const float mu = extended_filter_enabled ? kExtendedMu : normal_mu;
|
| - const float error_threshold = extended_filter_enabled
|
| - ? kExtendedErrorThreshold
|
| - : normal_error_threshold;
|
| for (; i < (PART_LEN1); i++) {
|
| float abs_ef;
|
| ef[0][i] /= (x_pow[i] + 1e-10f);
|
|
|