| Index: webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc
|
| diff --git a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc b/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc
|
| index fbf0ec098faffe5ac0b38e77497db022ef76a29c..04a539e712f8ff1273a0d6841b5660efc196a4a5 100644
|
| --- a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc
|
| +++ b/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc
|
| @@ -65,6 +65,7 @@ void ProcessOneFrame(int sample_rate_hz,
|
| beamformer->ProcessChunk(*capture_audio_buffer->split_data_f(),
|
| capture_audio_buffer->split_data_f());
|
| capture_audio_buffer->set_num_channels(1);
|
| + beamformer->PostFilter(capture_audio_buffer->split_data_f());
|
|
|
| if (sample_rate_hz > AudioProcessing::kSampleRate16kHz) {
|
| capture_audio_buffer->MergeFrequencyBands();
|
| @@ -262,8 +263,8 @@ TEST(BeamformerBitExactnessTest,
|
|
|
| TEST(BeamformerBitExactnessTest,
|
| Stereo16kHz_ArrayGeometry1_TargetDirection1) {
|
| - const float kOutputReference[] = {0.000064f, 0.000211f, 0.000075f,
|
| - 0.000064f, 0.000211f, 0.000075f};
|
| + const float kOutputReference[] = {0.000046f, 0.000297f, 0.000056f,
|
| + 0.000046f, 0.000297f, 0.000056f};
|
|
|
| RunBitExactnessTest(AudioProcessing::kSampleRate16kHz, CreateArrayGeometry(1),
|
| TargetDirection1, kOutputReference);
|
| @@ -280,8 +281,8 @@ TEST(BeamformerBitExactnessTest,
|
|
|
| TEST(BeamformerBitExactnessTest,
|
| Stereo48kHz_ArrayGeometry1_TargetDirection1) {
|
| - const float kOutputReference[] = {0.000155f, 0.000152f, 0.000159f,
|
| - 0.000155f, 0.000152f, 0.000159f};
|
| + const float kOutputReference[] = {0.000228f, 0.000224f, 0.000231f,
|
| + 0.000228f, 0.000224f, 0.000231f};
|
|
|
| RunBitExactnessTest(AudioProcessing::kSampleRate48kHz, CreateArrayGeometry(1),
|
| TargetDirection1, kOutputReference);
|
| @@ -300,8 +301,8 @@ TEST(BeamformerBitExactnessTest,
|
|
|
| TEST(BeamformerBitExactnessTest,
|
| Stereo16kHz_ArrayGeometry1_TargetDirection2) {
|
| - const float kOutputReference[] = {0.001144f, -0.001026f, 0.001074f,
|
| - 0.001144f, -0.001026f, 0.001074f};
|
| + const float kOutputReference[] = {0.001807f, -0.001761f, 0.001908f,
|
| + 0.001807f, -0.001761f, 0.001908f};
|
|
|
| RunBitExactnessTest(AudioProcessing::kSampleRate16kHz, CreateArrayGeometry(1),
|
| TargetDirection2, kOutputReference);
|
| @@ -309,8 +310,8 @@ TEST(BeamformerBitExactnessTest,
|
|
|
| TEST(BeamformerBitExactnessTest,
|
| Stereo32kHz_ArrayGeometry1_TargetDirection2) {
|
| - const float kOutputReference[] = {0.000732f, -0.000397f, 0.000610f,
|
| - 0.000732f, -0.000397f, 0.000610f};
|
| + const float kOutputReference[] = {0.000916f, -0.000641f, 0.000122f,
|
| + 0.000916f, -0.000641f, 0.000122f};
|
|
|
| RunBitExactnessTest(AudioProcessing::kSampleRate32kHz, CreateArrayGeometry(1),
|
| TargetDirection2, kOutputReference);
|
| @@ -318,8 +319,8 @@ TEST(BeamformerBitExactnessTest,
|
|
|
| TEST(BeamformerBitExactnessTest,
|
| Stereo48kHz_ArrayGeometry1_TargetDirection2) {
|
| - const float kOutputReference[] = {0.000106f, -0.000464f, 0.000188f,
|
| - 0.000106f, -0.000464f, 0.000188f};
|
| + const float kOutputReference[] = {0.000274f, -0.000307f, 0.000280f,
|
| + 0.000274f, -0.000307f, 0.000280f};
|
|
|
| RunBitExactnessTest(AudioProcessing::kSampleRate48kHz, CreateArrayGeometry(1),
|
| TargetDirection2, kOutputReference);
|
| @@ -327,8 +328,8 @@ TEST(BeamformerBitExactnessTest,
|
|
|
| TEST(BeamformerBitExactnessTest,
|
| Stereo8kHz_ArrayGeometry2_TargetDirection2) {
|
| - const float kOutputReference[] = {-0.000649f, 0.000576f, -0.000148f,
|
| - -0.000649f, 0.000576f, -0.000148f};
|
| + const float kOutputReference[] = {-0.001365f, -0.000137f, -0.000297f,
|
| + -0.001365f, -0.000137f, -0.000297f};
|
|
|
| RunBitExactnessTest(AudioProcessing::kSampleRate8kHz, CreateArrayGeometry(2),
|
| TargetDirection2, kOutputReference);
|
| @@ -336,8 +337,8 @@ TEST(BeamformerBitExactnessTest,
|
|
|
| TEST(BeamformerBitExactnessTest,
|
| Stereo16kHz_ArrayGeometry2_TargetDirection2) {
|
| - const float kOutputReference[] = {0.000808f, -0.000695f, 0.000739f,
|
| - 0.000808f, -0.000695f, 0.000739f};
|
| + const float kOutputReference[] = {0.001243f, -0.001196f, 0.001312f,
|
| + 0.001243f, -0.001196f, 0.001312f};
|
|
|
| RunBitExactnessTest(AudioProcessing::kSampleRate16kHz, CreateArrayGeometry(2),
|
| TargetDirection2, kOutputReference);
|
| @@ -345,8 +346,8 @@ TEST(BeamformerBitExactnessTest,
|
|
|
| TEST(BeamformerBitExactnessTest,
|
| Stereo32kHz_ArrayGeometry2_TargetDirection2) {
|
| - const float kOutputReference[] = {0.000580f, -0.000183f, 0.000458f,
|
| - 0.000580f, -0.000183f, 0.000458f};
|
| + const float kOutputReference[] = {0.000671f, -0.000366f, 0.000122f,
|
| + 0.000671f, -0.000366f, 0.000122f};
|
|
|
| RunBitExactnessTest(AudioProcessing::kSampleRate32kHz, CreateArrayGeometry(2),
|
| TargetDirection2, kOutputReference);
|
| @@ -354,8 +355,8 @@ TEST(BeamformerBitExactnessTest,
|
|
|
| TEST(BeamformerBitExactnessTest,
|
| Stereo48kHz_ArrayGeometry2_TargetDirection2) {
|
| - const float kOutputReference[] = {0.000075f, -0.000288f, 0.000156f,
|
| - 0.000075f, -0.000288f, 0.000156f};
|
| + const float kOutputReference[] = {0.000135f, -0.000236f, 0.000179f,
|
| + 0.000135f, -0.000236f, 0.000179f};
|
|
|
| RunBitExactnessTest(AudioProcessing::kSampleRate48kHz, CreateArrayGeometry(2),
|
| TargetDirection2, kOutputReference);
|
|
|