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

Replace leftover usage of old AEC interfaces

Browse Source 
This CL cleans up some code missed by this other CL:
https://webrtc-review.googlesource.com/c/src/+/101622

Bug: webrtc:9535
Change-Id: Ic4dac670914c92d69a10d38140fd853edb50450d
Reviewed-on: https://webrtc-review.googlesource.com/c/103400
Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
Commit-Queue: Sam Zackrisson <saza@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24951}
This commit is contained in:
Sam Zackrisson
2018-10-03 09:19:59 +02:00
committed by Commit Bot
parent d136b2884e
commit c1adcad833
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
media/engine/apm_helpers_unittest.cc
View File

@ -98,38 +98,36 @@ TEST(ApmHelpersTest, AgcStatus_EnableDisable) {
TEST(ApmHelpersTest, EcStatus_DefaultMode) { TEST(ApmHelpersTest, EcStatus_DefaultMode) {
TestHelper helper; TestHelper helper;
EchoCancellation* ec = helper.apm()->echo_cancellation(); webrtc::AudioProcessing::Config config = helper.apm()->GetConfig();
EchoControlMobile* ecm = helper.apm()->echo_control_mobile(); EXPECT_FALSE(config.echo_canceller.enabled);
EXPECT_FALSE(ec->is_enabled());
EXPECT_FALSE(ecm->is_enabled());
} }
TEST(ApmHelpersTest, EcStatus_EnableDisable) { TEST(ApmHelpersTest, EcStatus_EnableDisable) {
TestHelper helper; TestHelper helper;
EchoCancellation* ec = helper.apm()->echo_cancellation(); webrtc::AudioProcessing::Config config;
EchoControlMobile* ecm = helper.apm()->echo_control_mobile();
apm_helpers::SetEcStatus(helper.apm(), true, kEcAecm); apm_helpers::SetEcStatus(helper.apm(), true, kEcAecm);
EXPECT_FALSE(ec->is_enabled()); config = helper.apm()->GetConfig();
EXPECT_TRUE(ecm->is_enabled()); EXPECT_TRUE(config.echo_canceller.enabled);
EXPECT_TRUE(config.echo_canceller.mobile_mode);
apm_helpers::SetEcStatus(helper.apm(), false, kEcAecm); apm_helpers::SetEcStatus(helper.apm(), false, kEcAecm);
EXPECT_FALSE(ec->is_enabled()); config = helper.apm()->GetConfig();
EXPECT_FALSE(ecm->is_enabled()); EXPECT_FALSE(config.echo_canceller.enabled);
apm_helpers::SetEcStatus(helper.apm(), true, kEcConference); apm_helpers::SetEcStatus(helper.apm(), true, kEcConference);
EXPECT_TRUE(ec->is_enabled()); config = helper.apm()->GetConfig();
EXPECT_FALSE(ecm->is_enabled()); EXPECT_TRUE(config.echo_canceller.enabled);
EXPECT_EQ(EchoCancellation::kHighSuppression, ec->suppression_level()); EXPECT_FALSE(config.echo_canceller.mobile_mode);
apm_helpers::SetEcStatus(helper.apm(), false, kEcConference); apm_helpers::SetEcStatus(helper.apm(), false, kEcConference);
EXPECT_FALSE(ec->is_enabled()); config = helper.apm()->GetConfig();
EXPECT_FALSE(ecm->is_enabled()); EXPECT_FALSE(config.echo_canceller.enabled);
EXPECT_EQ(EchoCancellation::kHighSuppression, ec->suppression_level());
apm_helpers::SetEcStatus(helper.apm(), true, kEcAecm); apm_helpers::SetEcStatus(helper.apm(), true, kEcAecm);
EXPECT_FALSE(ec->is_enabled()); config = helper.apm()->GetConfig();
EXPECT_TRUE(ecm->is_enabled()); EXPECT_TRUE(config.echo_canceller.enabled);
EXPECT_TRUE(config.echo_canceller.mobile_mode);
} }
TEST(ApmHelpersTest, NsStatus_DefaultMode) { TEST(ApmHelpersTest, NsStatus_DefaultMode) {