mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-17 07:37:51 +01:00

This CL removes the updating of the buffered data used to to pad the 64 sample blocks to 128 samples FFTs. As that padding was used incorrectly in one place this resolves an important issue. Bug: webrtc:9159,chromium:833801,webrtc:9206 Change-Id: Ie6830878ebec6130b61d4e7e3169357f2e253073 Reviewed-on: https://webrtc-review.googlesource.com/73240 Reviewed-by: Gustaf Ullberg <gustaf@webrtc.org> Commit-Queue: Per Åhgren <peah@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23059}
131 lines
5.9 KiB
C++
131 lines
5.9 KiB
C++
/*
|
|
* Copyright (c) 2017 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 "modules/audio_processing/aec3/aec3_fft.h"
|
|
|
|
#include <algorithm>
|
|
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace webrtc {
|
|
|
|
namespace {
|
|
|
|
const float kHanning64[kFftLengthBy2] = {
|
|
0.f, 0.00248461f, 0.00991376f, 0.0222136f, 0.03926189f,
|
|
0.06088921f, 0.08688061f, 0.11697778f, 0.15088159f, 0.1882551f,
|
|
0.22872687f, 0.27189467f, 0.31732949f, 0.36457977f, 0.41317591f,
|
|
0.46263495f, 0.51246535f, 0.56217185f, 0.61126047f, 0.65924333f,
|
|
0.70564355f, 0.75f, 0.79187184f, 0.83084292f, 0.86652594f,
|
|
0.89856625f, 0.92664544f, 0.95048443f, 0.96984631f, 0.98453864f,
|
|
0.99441541f, 0.99937846f, 0.99937846f, 0.99441541f, 0.98453864f,
|
|
0.96984631f, 0.95048443f, 0.92664544f, 0.89856625f, 0.86652594f,
|
|
0.83084292f, 0.79187184f, 0.75f, 0.70564355f, 0.65924333f,
|
|
0.61126047f, 0.56217185f, 0.51246535f, 0.46263495f, 0.41317591f,
|
|
0.36457977f, 0.31732949f, 0.27189467f, 0.22872687f, 0.1882551f,
|
|
0.15088159f, 0.11697778f, 0.08688061f, 0.06088921f, 0.03926189f,
|
|
0.0222136f, 0.00991376f, 0.00248461f, 0.f};
|
|
|
|
// Hanning window from Matlab command win = sqrt(hanning(128)).
|
|
const float kSqrtHanning128[kFftLength] = {
|
|
0.00000000000000f, 0.02454122852291f, 0.04906767432742f, 0.07356456359967f,
|
|
0.09801714032956f, 0.12241067519922f, 0.14673047445536f, 0.17096188876030f,
|
|
0.19509032201613f, 0.21910124015687f, 0.24298017990326f, 0.26671275747490f,
|
|
0.29028467725446f, 0.31368174039889f, 0.33688985339222f, 0.35989503653499f,
|
|
0.38268343236509f, 0.40524131400499f, 0.42755509343028f, 0.44961132965461f,
|
|
0.47139673682600f, 0.49289819222978f, 0.51410274419322f, 0.53499761988710f,
|
|
0.55557023301960f, 0.57580819141785f, 0.59569930449243f, 0.61523159058063f,
|
|
0.63439328416365f, 0.65317284295378f, 0.67155895484702f, 0.68954054473707f,
|
|
0.70710678118655f, 0.72424708295147f, 0.74095112535496f, 0.75720884650648f,
|
|
0.77301045336274f, 0.78834642762661f, 0.80320753148064f, 0.81758481315158f,
|
|
0.83146961230255f, 0.84485356524971f, 0.85772861000027f, 0.87008699110871f,
|
|
0.88192126434835f, 0.89322430119552f, 0.90398929312344f, 0.91420975570353f,
|
|
0.92387953251129f, 0.93299279883474f, 0.94154406518302f, 0.94952818059304f,
|
|
0.95694033573221f, 0.96377606579544f, 0.97003125319454f, 0.97570213003853f,
|
|
0.98078528040323f, 0.98527764238894f, 0.98917650996478f, 0.99247953459871f,
|
|
0.99518472667220f, 0.99729045667869f, 0.99879545620517f, 0.99969881869620f,
|
|
1.00000000000000f, 0.99969881869620f, 0.99879545620517f, 0.99729045667869f,
|
|
0.99518472667220f, 0.99247953459871f, 0.98917650996478f, 0.98527764238894f,
|
|
0.98078528040323f, 0.97570213003853f, 0.97003125319454f, 0.96377606579544f,
|
|
0.95694033573221f, 0.94952818059304f, 0.94154406518302f, 0.93299279883474f,
|
|
0.92387953251129f, 0.91420975570353f, 0.90398929312344f, 0.89322430119552f,
|
|
0.88192126434835f, 0.87008699110871f, 0.85772861000027f, 0.84485356524971f,
|
|
0.83146961230255f, 0.81758481315158f, 0.80320753148064f, 0.78834642762661f,
|
|
0.77301045336274f, 0.75720884650648f, 0.74095112535496f, 0.72424708295147f,
|
|
0.70710678118655f, 0.68954054473707f, 0.67155895484702f, 0.65317284295378f,
|
|
0.63439328416365f, 0.61523159058063f, 0.59569930449243f, 0.57580819141785f,
|
|
0.55557023301960f, 0.53499761988710f, 0.51410274419322f, 0.49289819222978f,
|
|
0.47139673682600f, 0.44961132965461f, 0.42755509343028f, 0.40524131400499f,
|
|
0.38268343236509f, 0.35989503653499f, 0.33688985339222f, 0.31368174039889f,
|
|
0.29028467725446f, 0.26671275747490f, 0.24298017990326f, 0.21910124015687f,
|
|
0.19509032201613f, 0.17096188876030f, 0.14673047445536f, 0.12241067519922f,
|
|
0.09801714032956f, 0.07356456359967f, 0.04906767432742f, 0.02454122852291f};
|
|
|
|
} // namespace
|
|
|
|
// TODO(peah): Change x to be std::array once the rest of the code allows this.
|
|
void Aec3Fft::ZeroPaddedFft(rtc::ArrayView<const float> x,
|
|
Window window,
|
|
FftData* X) const {
|
|
RTC_DCHECK(X);
|
|
RTC_DCHECK_EQ(kFftLengthBy2, x.size());
|
|
std::array<float, kFftLength> fft;
|
|
std::fill(fft.begin(), fft.begin() + kFftLengthBy2, 0.f);
|
|
switch (window) {
|
|
case Window::kRectangular:
|
|
std::copy(x.begin(), x.end(), fft.begin() + kFftLengthBy2);
|
|
break;
|
|
case Window::kHanning:
|
|
std::transform(x.begin(), x.end(), std::begin(kHanning64),
|
|
fft.begin() + kFftLengthBy2,
|
|
[](float a, float b) { return a * b; });
|
|
break;
|
|
case Window::kSqrtHanning:
|
|
RTC_NOTREACHED();
|
|
break;
|
|
default:
|
|
RTC_NOTREACHED();
|
|
}
|
|
|
|
Fft(&fft, X);
|
|
}
|
|
|
|
void Aec3Fft::PaddedFft(rtc::ArrayView<const float> x,
|
|
rtc::ArrayView<const float> x_old,
|
|
Window window,
|
|
FftData* X) const {
|
|
RTC_DCHECK(X);
|
|
RTC_DCHECK_EQ(kFftLengthBy2, x.size());
|
|
RTC_DCHECK_EQ(kFftLengthBy2, x_old.size());
|
|
std::array<float, kFftLength> fft;
|
|
|
|
switch (window) {
|
|
case Window::kRectangular:
|
|
std::copy(x_old.begin(), x_old.end(), fft.begin());
|
|
std::copy(x.begin(), x.end(), fft.begin() + x_old.size());
|
|
break;
|
|
case Window::kHanning:
|
|
RTC_NOTREACHED();
|
|
break;
|
|
case Window::kSqrtHanning:
|
|
std::transform(x_old.begin(), x_old.end(), std::begin(kSqrtHanning128),
|
|
fft.begin(), std::multiplies<float>());
|
|
std::transform(x.begin(), x.end(),
|
|
std::begin(kSqrtHanning128) + x_old.size(),
|
|
fft.begin() + x_old.size(), std::multiplies<float>());
|
|
break;
|
|
default:
|
|
RTC_NOTREACHED();
|
|
}
|
|
|
|
Fft(&fft, X);
|
|
}
|
|
|
|
} // namespace webrtc
|