zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected the handling of saturation in the AEC3 alignment

Browse Source 
Bug: webrtc:8782, chromium:804263
Change-Id: I58660364f66959cc5bea3b081a626e743acedb1b
Reviewed-on: https://webrtc-review.googlesource.com/42581
Reviewed-by: Gustaf Ullberg <gustaf@webrtc.org>
Commit-Queue: Per Åhgren <peah@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21725}
This commit is contained in:
Per Åhgren
2018-01-22 12:00:19 +01:00
committed by Commit Bot
parent 395791fea7
commit 700ef33edc
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
modules/audio_processing/aec3/matched_filter.cc
View File

@ -89,11 +89,16 @@ void MatchedFilterCore_NEON(size_t x_start_index,
s += v[0] + v[1] + v[2] + v[3];
// Compute the matched filter error.
const float e = std::min(32767.f, std::max(-32768.f, y[i] - s));
*error_sum += e * e;
float e = y[i] - s;
const bool saturation = y[i] >= 32000.f || y[i] <= -32000.f ||
s >= 32000.f || s <= -32000.f || e >= 32000.f ||
e <= -32000.f;
e = std::min(32767.f, std::max(-32768.f, e));
(*error_sum) += e * e;
// Update the matched filter estimate in an NLMS manner.
if (x2_sum > x2_sum_threshold) {
if (x2_sum > x2_sum_threshold && !saturation) {
RTC_DCHECK_LT(0.f, x2_sum);
const float alpha = 0.7f * e / x2_sum;
const float32x4_t alpha_128 = vmovq_n_f32(alpha);
@ -199,11 +204,16 @@ void MatchedFilterCore_SSE2(size_t x_start_index,
s += v[0] + v[1] + v[2] + v[3];
// Compute the matched filter error.
const float e = std::min(32767.f, std::max(-32768.f, y[i] - s));
*error_sum += e * e;
float e = y[i] - s;
const bool saturation = y[i] >= 32000.f || y[i] <= -32000.f ||
s >= 32000.f || s <= -32000.f || e >= 32000.f ||
e <= -32000.f;
e = std::min(32767.f, std::max(-32768.f, e));
(*error_sum) += e * e;
// Update the matched filter estimate in an NLMS manner.
if (x2_sum > x2_sum_threshold) {
if (x2_sum > x2_sum_threshold && !saturation) {
RTC_DCHECK_LT(0.f, x2_sum);
const float alpha = 0.7f * e / x2_sum;
const __m128 alpha_128 = _mm_set1_ps(alpha);
@ -265,11 +275,16 @@ void MatchedFilterCore(size_t x_start_index,
}
// Compute the matched filter error.
const float e = std::min(32767.f, std::max(-32768.f, y[i] - s));
float e = y[i] - s;
const bool saturation = y[i] >= 32000.f || y[i] <= -32000.f ||
s >= 32000.f || s <= -32000.f || e >= 32000.f ||
e <= -32000.f;
e = std::min(32767.f, std::max(-32768.f, e));
(*error_sum) += e * e;
// Update the matched filter estimate in an NLMS manner.
if (x2_sum > x2_sum_threshold) {
if (x2_sum > x2_sum_threshold && !saturation) {
RTC_DCHECK_LT(0.f, x2_sum);
const float alpha = 0.7f * e / x2_sum;