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

Further AGC refactoring in preparation for adding multichannel support

Browse Source 
Bug: webrtc:10859
Change-Id: If7d58a615a365a0b0f7b49e0cc2392b9bd5e2a0c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/159028
Commit-Queue: Per Åhgren <peah@webrtc.org>
Reviewed-by: Sam Zackrisson <saza@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29736}
This commit is contained in:
Per Åhgren
2019-11-07 20:35:50 +01:00
committed by Commit Bot
parent 6b838beb4d
commit b8c1be5b6e
6 changed files with 27 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
modules/audio_processing/agc/agc_manager_direct_unittest.cc
View File

@ -695,8 +695,7 @@ TEST(AgcManagerDirectStandaloneTest, DisableDigitalDisablesDigital) {
MockGainControl gctrl;
TestVolumeCallbacks volume;
AgcManagerDirect manager(agc.release(), &gctrl, &volume, kInitialVolume,
kClippedMin,
AgcManagerDirect manager(&gctrl, &volume, kInitialVolume, kClippedMin,
/* use agc2 level estimation */ false,
/* disable digital adaptive */ true);
@ -710,14 +709,14 @@ TEST(AgcManagerDirectStandaloneTest, DisableDigitalDisablesDigital) {
TEST(AgcManagerDirectStandaloneTest, AgcMinMicLevelExperiment) {
auto agc_man = std::unique_ptr<AgcManagerDirect>(new AgcManagerDirect(
nullptr, nullptr, nullptr, kInitialVolume, kClippedMin, true, true));
nullptr, nullptr, kInitialVolume, kClippedMin, true, true));
EXPECT_EQ(agc_man->min_mic_level(), kMinMicLevel);
EXPECT_EQ(agc_man->startup_min_level(), kInitialVolume);
{
test::ScopedFieldTrials field_trial(
"WebRTC-Audio-AgcMinMicLevelExperiment/Disabled/");
agc_man.reset(new AgcManagerDirect(
nullptr, nullptr, nullptr, kInitialVolume, kClippedMin, true, true));
agc_man.reset(new AgcManagerDirect(nullptr, nullptr, kInitialVolume,
kClippedMin, true, true));
EXPECT_EQ(agc_man->min_mic_level(), kMinMicLevel);
EXPECT_EQ(agc_man->startup_min_level(), kInitialVolume);
}
@ -725,16 +724,16 @@ TEST(AgcManagerDirectStandaloneTest, AgcMinMicLevelExperiment) {
// Valid range of field-trial parameter is [0,255].
test::ScopedFieldTrials field_trial(
"WebRTC-Audio-AgcMinMicLevelExperiment/Enabled-256/");
agc_man.reset(new AgcManagerDirect(
nullptr, nullptr, nullptr, kInitialVolume, kClippedMin, true, true));
agc_man.reset(new AgcManagerDirect(nullptr, nullptr, kInitialVolume,
kClippedMin, true, true));
EXPECT_EQ(agc_man->min_mic_level(), kMinMicLevel);
EXPECT_EQ(agc_man->startup_min_level(), kInitialVolume);
}
{
test::ScopedFieldTrials field_trial(
"WebRTC-Audio-AgcMinMicLevelExperiment/Enabled--1/");
agc_man.reset(new AgcManagerDirect(
nullptr, nullptr, nullptr, kInitialVolume, kClippedMin, true, true));
agc_man.reset(new AgcManagerDirect(nullptr, nullptr, kInitialVolume,
kClippedMin, true, true));
EXPECT_EQ(agc_man->min_mic_level(), kMinMicLevel);
EXPECT_EQ(agc_man->startup_min_level(), kInitialVolume);
}
@ -744,8 +743,8 @@ TEST(AgcManagerDirectStandaloneTest, AgcMinMicLevelExperiment) {
// be changed.
test::ScopedFieldTrials field_trial(
"WebRTC-Audio-AgcMinMicLevelExperiment/Enabled-50/");
agc_man.reset(new AgcManagerDirect(
nullptr, nullptr, nullptr, kInitialVolume, kClippedMin, true, true));
agc_man.reset(new AgcManagerDirect(nullptr, nullptr, kInitialVolume,
kClippedMin, true, true));
EXPECT_EQ(agc_man->min_mic_level(), 50);
EXPECT_EQ(agc_man->startup_min_level(), kInitialVolume);
}
@ -755,8 +754,8 @@ TEST(AgcManagerDirectStandaloneTest, AgcMinMicLevelExperiment) {
// level set by the experiment.
test::ScopedFieldTrials field_trial(
"WebRTC-Audio-AgcMinMicLevelExperiment/Enabled-50/");
agc_man.reset(new AgcManagerDirect(nullptr, nullptr, nullptr, 30,
kClippedMin, true, true));
agc_man.reset(
new AgcManagerDirect(nullptr, nullptr, 30, kClippedMin, true, true));
EXPECT_EQ(agc_man->min_mic_level(), 50);
EXPECT_EQ(agc_man->startup_min_level(), 50);
}