webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc - Issue 1685703004: Fix and simplify the power estimation in the IntelligibilityEnhancer

Unified Diff: webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc

Issue 1685703004: Fix and simplify the power estimation in the IntelligibilityEnhancer (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@ie

Patch Set: Re-add the intelligibility namespace Created 4 years, 10 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

« no previous file with comments | « webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.cc ('k') | webrtc/modules/audio_processing/intelligibility/intelligibility_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc

diff --git a/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc b/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc

index 436d174775922c95a059b9dc13b7fe9ae6d8a01b..0d15406017b9537d10d89a7bcdf7ddb596d1b4a8 100644

--- a/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc

+++ b/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc

@@ -8,10 +8,6 @@

* be found in the AUTHORS file in the root of the source tree.

-//

-// Unit tests for intelligibility enhancer.

-//

#include <math.h>

#include <stdlib.h>

#include <algorithm>

@@ -32,28 +28,29 @@ const float kTestCenterFreqs[] = {

13.169f, 26.965f, 41.423f, 56.577f, 72.461f, 89.113f, 106.57f, 124.88f,

144.08f, 164.21f, 185.34f, 207.5f, 230.75f, 255.16f, 280.77f, 307.66f,

335.9f, 365.56f, 396.71f, 429.44f, 463.84f, 500.f};

-const float kTestFilterBank[][2] = {{0.055556f, 0.f},

- {0.055556f, 0.f},

- {0.055556f, 0.2f},

- {0, 0.2f},

- {0, 0.2f}};

+const float kTestFilterBank[][9] = {

+ {0.2f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f},

+ {0.2f, 0.25f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f},

+ {0.f, 0.25f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f},

+ {0.f, 0.25f, 0.25f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f},

+ {0.f, 0.f, 0.25f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f},

+ {0.f, 0.f, 0.25f, 0.142857f, 0.f, 0.f, 0.f, 0.f, 0.f},

+ {0.f, 0.f, 0.25f, 0.285714f, 0.f, 0.f, 0.f, 0.f, 0.f},

+ {0.f, 0.f, 0.f, 0.285714f, 0.142857f, 0.f, 0.f, 0.f, 0.f},

+ {0.f, 0.f, 0.f, 0.285714f, 0.285714f, 0.f, 0.f, 0.f, 0.f},

+ {0.f, 0.f, 0.f, 0.f, 0.285714f, 0.142857f, 0.f, 0.f, 0.f},

+ {0.f, 0.f, 0.f, 0.f, 0.285714f, 0.285714f, 0.f, 0.f, 0.f},

+ {0.f, 0.f, 0.f, 0.f, 0.f, 0.285714f, 0.142857f, 0.f, 0.f},

+ {0.f, 0.f, 0.f, 0.f, 0.f, 0.285714f, 0.285714f, 0.f, 0.f},

+ {0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.285714f, 0.142857f, 0.f},

+ {0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.285714f, 0.285714f, 0.f},

+ {0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.285714f, 0.f},

+ {0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.285714f, 0.5f},

+ {0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.5f}};

static_assert(arraysize(kTestCenterFreqs) == arraysize(kTestFilterBank),

"Test filterbank badly initialized.");

@@ -63,14 +60,14 @@ const float kTestZeroVar[] = {1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f,

1.f, 1.f, 1.f, 0.f, 0.f, 0.f, 0.f, 0.f,

0.f, 0.f, 0.f, 0.f, 0.f, 0.f};

static_assert(arraysize(kTestCenterFreqs) == arraysize(kTestZeroVar),

- "Variance test data badly initialized.");

+ "Power test data badly initialized.");

const float kTestNonZeroVarLambdaTop[] = {

1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f,

1.f, 1.f, 1.f, 0.f, 0.f, 0.0351f, 0.0636f, 0.0863f,

0.1037f, 0.1162f, 0.1236f, 0.1251f, 0.1189f, 0.0993f};

static_assert(arraysize(kTestCenterFreqs) ==

arraysize(kTestNonZeroVarLambdaTop),

- "Variance test data badly initialized.");

+ "Power test data badly initialized.");

const float kMaxTestError = 0.005f;

// Enhancer initialization parameters.

@@ -81,9 +78,6 @@ const int kFragmentSize = kSampleRate / 100;

} // namespace

-using std::vector;

-using intelligibility::VarianceArray;

class IntelligibilityEnhancerTest : public ::testing::Test {

protected:

IntelligibilityEnhancerTest()

@@ -92,9 +86,8 @@ class IntelligibilityEnhancerTest : public ::testing::Test {

enh_.reset(new IntelligibilityEnhancer(config_));

}

- bool CheckUpdate(VarianceArray::StepType step_type) {

+ bool CheckUpdate() {

config_.sample_rate_hz = kSampleRate;

- config_.var_type = step_type;

enh_.reset(new IntelligibilityEnhancer(config_));

float* clear_cursor = &clear_data_[0];

float* noise_cursor = &noise_data_[0];

@@ -113,37 +106,25 @@ class IntelligibilityEnhancerTest : public ::testing::Test {

IntelligibilityEnhancer::Config config_;

rtc::scoped_ptr<IntelligibilityEnhancer> enh_;

- vector<float> clear_data_;

- vector<float> noise_data_;

- vector<float> orig_data_;

+ std::vector<float> clear_data_;

+ std::vector<float> noise_data_;

+ std::vector<float> orig_data_;

};

-// For each class of generated data, tests that render stream is

-// updated when it should be for each variance update method.

+// For each class of generated data, tests that render stream is updated when

+// it should be.

TEST_F(IntelligibilityEnhancerTest, TestRenderUpdate) {

- vector<VarianceArray::StepType> step_types;

- step_types.push_back(VarianceArray::kStepInfinite);

- step_types.push_back(VarianceArray::kStepDecaying);

- step_types.push_back(VarianceArray::kStepWindowed);

- step_types.push_back(VarianceArray::kStepBlocked);

- step_types.push_back(VarianceArray::kStepBlockBasedMovingAverage);

std::fill(noise_data_.begin(), noise_data_.end(), 0.0f);

std::fill(orig_data_.begin(), orig_data_.end(), 0.0f);

- for (auto step_type : step_types) {

- std::fill(clear_data_.begin(), clear_data_.end(), 0.0f);

- EXPECT_FALSE(CheckUpdate(step_type));

- }

+ std::fill(clear_data_.begin(), clear_data_.end(), 0.0f);

+ EXPECT_FALSE(CheckUpdate());

std::srand(1);

auto float_rand = []() { return std::rand() * 2.f / RAND_MAX - 1; };

std::generate(noise_data_.begin(), noise_data_.end(), float_rand);

- for (auto step_type : step_types) {

- EXPECT_FALSE(CheckUpdate(step_type));

- }

- for (auto step_type : step_types) {

- std::generate(clear_data_.begin(), clear_data_.end(), float_rand);

- orig_data_ = clear_data_;

- EXPECT_TRUE(CheckUpdate(step_type));

- }

+ EXPECT_FALSE(CheckUpdate());

+ std::generate(clear_data_.begin(), clear_data_.end(), float_rand);

+ orig_data_ = clear_data_;

+ EXPECT_TRUE(CheckUpdate());

}

// Tests ERB bank creation, comparing against matlab output.

@@ -163,11 +144,11 @@ TEST_F(IntelligibilityEnhancerTest, TestErbCreation) {

// against matlab output.

TEST_F(IntelligibilityEnhancerTest, TestSolveForGains) {

ASSERT_EQ(kTestStartFreq, enh_->start_freq_);

- vector<float> sols(enh_->bank_size_);

+ std::vector<float> sols(enh_->bank_size_);

float lambda = -0.001f;

for (size_t i = 0; i < enh_->bank_size_; i++) {

- enh_->filtered_clear_var_[i] = 0.0f;

- enh_->filtered_noise_var_[i] = 0.0f;

+ enh_->filtered_clear_pow_[i] = 0.0f;

+ enh_->filtered_noise_pow_[i] = 0.0f;

enh_->rho_[i] = 0.02f;

}

enh_->SolveForGainsGivenLambda(lambda, enh_->start_freq_, &sols[0]);

@@ -175,8 +156,8 @@ TEST_F(IntelligibilityEnhancerTest, TestSolveForGains) {

EXPECT_NEAR(kTestZeroVar[i], sols[i], kMaxTestError);

}

for (size_t i = 0; i < enh_->bank_size_; i++) {

- enh_->filtered_clear_var_[i] = static_cast<float>(i + 1);

- enh_->filtered_noise_var_[i] = static_cast<float>(enh_->bank_size_ - i);

+ enh_->filtered_clear_pow_[i] = static_cast<float>(i + 1);

+ enh_->filtered_noise_pow_[i] = static_cast<float>(enh_->bank_size_ - i);

}

enh_->SolveForGainsGivenLambda(lambda, enh_->start_freq_, &sols[0]);

for (size_t i = 0; i < enh_->bank_size_; i++) {