webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc - Issue 1982183002: Pull out the PostFilter to its own NonlinearBeamformer API

Unified Diff: webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc

Issue 1982183002: Pull out the PostFilter to its own NonlinearBeamformer API (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Drop Beamformer Interface Created 4 years, 7 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

« webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_test.cc ('K') | « webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_test.cc ('k') | webrtc/modules/audio_processing/include/audio_processing.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..f5b8dd985230647242491543268d07d866f29df4 100644

--- a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc

+++ b/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc

@@ -57,14 +57,14 @@ const size_t kNumFramesToProcess = 1000;

void ProcessOneFrame(int sample_rate_hz,

AudioBuffer* capture_audio_buffer,

- Beamformer<float>* beamformer) {

+ NonlinearBeamformer* beamformer) {

if (sample_rate_hz > AudioProcessing::kSampleRate16kHz) {

capture_audio_buffer->SplitIntoFrequencyBands();

}

- beamformer->ProcessChunk(*capture_audio_buffer->split_data_f(),

- capture_audio_buffer->split_data_f());

+ beamformer->AnalyzeChunk(*capture_audio_buffer->split_data_f());

capture_audio_buffer->set_num_channels(1);

peah-webrtc 2016/06/08 12:04:55 With the changes in this CL, the set_num_channels(

aluebs-webrtc 2016/06/09 02:11:46 If by downmix you mean it just discards all channe

+ beamformer->PostFilter(capture_audio_buffer->split_data_f());

if (sample_rate_hz > AudioProcessing::kSampleRate16kHz) {

capture_audio_buffer->MergeFrequencyBands();

@@ -262,8 +262,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.000077f, -0.000147f, -0.000138f,

+ -0.000077f, -0.000147f, -0.000138f};

RunBitExactnessTest(AudioProcessing::kSampleRate16kHz, CreateArrayGeometry(1),

TargetDirection1, kOutputReference);

@@ -271,8 +271,8 @@ TEST(BeamformerBitExactnessTest,

TEST(BeamformerBitExactnessTest,

Stereo32kHz_ArrayGeometry1_TargetDirection1) {

- const float kOutputReference[] = {0.000183f, 0.000183f, 0.000183f,

- 0.000183f, 0.000183f, 0.000183f};

+ const float kOutputReference[] = {-0.000061f, -0.000061f, -0.000061f,

+ -0.000061f, -0.000061f, -0.000061f};

RunBitExactnessTest(AudioProcessing::kSampleRate32kHz, CreateArrayGeometry(1),

TargetDirection1, kOutputReference);

@@ -280,8 +280,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.000450f, 0.000436f, 0.000433f,

+ 0.000450f, 0.000436f, 0.000433f};

RunBitExactnessTest(AudioProcessing::kSampleRate48kHz, CreateArrayGeometry(1),

TargetDirection1, kOutputReference);

@@ -300,8 +300,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.000221f, -0.000249f, 0.000140f,

+ 0.000221f, -0.000249f, 0.000140f};

RunBitExactnessTest(AudioProcessing::kSampleRate16kHz, CreateArrayGeometry(1),

TargetDirection2, kOutputReference);

@@ -309,8 +309,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.000763f, -0.000336f, 0.000549f,

+ 0.000763f, -0.000336f, 0.000549f};

RunBitExactnessTest(AudioProcessing::kSampleRate32kHz, CreateArrayGeometry(1),

TargetDirection2, kOutputReference);

@@ -318,8 +318,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.000004f, -0.000494f, 0.000255f,

+ -0.000004f, -0.000494f, 0.000255f};

RunBitExactnessTest(AudioProcessing::kSampleRate48kHz, CreateArrayGeometry(1),

TargetDirection2, kOutputReference);

@@ -327,8 +327,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.000914f, 0.002170f, -0.002382f,

+ -0.000914f, 0.002170f, -0.002382f};

RunBitExactnessTest(AudioProcessing::kSampleRate8kHz, CreateArrayGeometry(2),

TargetDirection2, kOutputReference);

@@ -336,8 +336,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.000179f, -0.000179f, 0.000081f,

+ 0.000179f, -0.000179f, 0.000081f};

RunBitExactnessTest(AudioProcessing::kSampleRate16kHz, CreateArrayGeometry(2),

TargetDirection2, kOutputReference);

@@ -345,8 +345,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.000549f, -0.000214f, 0.000366f,

+ 0.000549f, -0.000214f, 0.000366f};

RunBitExactnessTest(AudioProcessing::kSampleRate32kHz, CreateArrayGeometry(2),

TargetDirection2, kOutputReference);

@@ -354,8 +354,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.000019f, -0.000310f, 0.000182f,

+ 0.000019f, -0.000310f, 0.000182f};

RunBitExactnessTest(AudioProcessing::kSampleRate48kHz, CreateArrayGeometry(2),

TargetDirection2, kOutputReference);