mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-15 14:50:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

APM: InputVolumeController tests simplified

Browse source 
Bug: webrtc:7494
Change-Id: I8f622b950aed8f1d5c42fcb8eb0c37c86532b6fe
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/285440
Reviewed-by: Hanna Silen <silen@webrtc.org>
Commit-Queue: Alessio Bazzica <alessiob@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38757}
This commit is contained in:
Alessio Bazzica 2022-11-29 10:59:40 +01:00 committed by WebRTC LUCI CQ
parent bf2f605e03
commit 2076af4673
1 changed files with 76 additions and 158 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

234
modules/audio_processing/agc2/input_volume_controller_unittest.cc
View file

@ -14,7 +14,6 @@
#include <fstream> #include <fstream>
#include <limits> #include <limits>
#include <string> #include <string>
#include <tuple>
#include <vector> #include <vector>
#include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/numerics/safe_minmax.h"
@ -380,42 +379,28 @@ class InputVolumeControllerTestHelper {
}; };
class InputVolumeControllerParametrizedTest class InputVolumeControllerParametrizedTest
: public ::testing::TestWithParam<std::tuple<absl::optional<int>, bool>> { : public ::testing::TestWithParam<absl::optional<int>> {
protected: protected:
InputVolumeControllerParametrizedTest() InputVolumeControllerParametrizedTest()
: field_trials_( : field_trials_(GetAgcMinMicLevelExperimentFieldTrial(GetParam())) {}
GetAgcMinMicLevelExperimentFieldTrial(std::get<0>(GetParam()))) {}
bool IsMinMicLevelOverridden() const { bool IsMinMicLevelOverridden() const { return GetParam().has_value(); }
return std::get<0>(GetParam()).has_value(); int GetMinMicLevel() const { return GetParam().value_or(kMinMicLevel); }
}
int GetMinMicLevel() const {
return std::get<0>(GetParam()).value_or(kMinMicLevel);
}
// TODO(webrtc:7494): Remove, `RmsErrorHasValue()` always returns true.
bool RmsErrorHasValue() const { return std::get<1>(GetParam()); }
absl::optional<float> GetValueOrEmpty(float value) const {
return RmsErrorHasValue() ? absl::optional<float>(value) : absl::nullopt;
}
private: private:
test::ScopedFieldTrials field_trials_; test::ScopedFieldTrials field_trials_;
}; };
INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P(,
, InputVolumeControllerParametrizedTest,
InputVolumeControllerParametrizedTest, ::testing::Values(absl::nullopt, 12, 20));
::testing::Combine(testing::Values(absl::nullopt, 12, 20),
testing::Values(true)));
TEST_P(InputVolumeControllerParametrizedTest, TEST_P(InputVolumeControllerParametrizedTest,
StartupMinVolumeConfigurationIsRespected) { StartupMinVolumeConfigurationIsRespected) {
InputVolumeControllerTestHelper helper; InputVolumeControllerTestHelper helper;
helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability, helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability,
GetValueOrEmpty(kSpeechLevel)); kSpeechLevel);
EXPECT_EQ(kInitialInputVolume, helper.manager.recommended_analog_level()); EXPECT_EQ(kInitialInputVolume, helper.manager.recommended_analog_level());
} }
@ -423,97 +408,77 @@ TEST_P(InputVolumeControllerParametrizedTest,
TEST_P(InputVolumeControllerParametrizedTest, MicVolumeResponseToRmsError) { TEST_P(InputVolumeControllerParametrizedTest, MicVolumeResponseToRmsError) {
InputVolumeControllerTestHelper helper; InputVolumeControllerTestHelper helper;
helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability, helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability,
GetValueOrEmpty(kSpeechLevel)); kSpeechLevel);
// Inside the digital gain's window; no change of volume. // Inside the digital gain's window; no change of volume.
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -23.0f);
GetValueOrEmpty(-23.0f));
// Inside the digital gain's window; no change of volume. // Inside the digital gain's window; no change of volume.
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -28.0f);
GetValueOrEmpty(-28.0f));
// Above the digital gain's window; volume should be increased. // Above the digital gain's window; volume should be increased.
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -29.0f);
GetValueOrEmpty(-29.0f));
EXPECT_EQ(128, helper.manager.recommended_analog_level()); EXPECT_EQ(128, helper.manager.recommended_analog_level());
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -38.0f);
GetValueOrEmpty(-38.0f));
EXPECT_EQ(156, helper.manager.recommended_analog_level()); EXPECT_EQ(156, helper.manager.recommended_analog_level());
// Inside the digital gain's window; no change of volume. // Inside the digital gain's window; no change of volume.
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -23.0f);
GetValueOrEmpty(-23.0f)); helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -18.0f);
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability,
GetValueOrEmpty(-18.0f));
// Below the digial gain's window; volume should be decreased. // Below the digial gain's window; volume should be decreased.
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -17.0f);
GetValueOrEmpty(-17.0f));
EXPECT_EQ(155, helper.manager.recommended_analog_level()); EXPECT_EQ(155, helper.manager.recommended_analog_level());
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -17.0f);
GetValueOrEmpty(-17.0f));
EXPECT_EQ(151, helper.manager.recommended_analog_level()); EXPECT_EQ(151, helper.manager.recommended_analog_level());
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -9.0f);
GetValueOrEmpty(-9.0f));
EXPECT_EQ(119, helper.manager.recommended_analog_level()); EXPECT_EQ(119, helper.manager.recommended_analog_level());
} }
TEST_P(InputVolumeControllerParametrizedTest, MicVolumeIsLimited) { TEST_P(InputVolumeControllerParametrizedTest, MicVolumeIsLimited) {
InputVolumeControllerTestHelper helper; InputVolumeControllerTestHelper helper;
helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability, helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability,
GetValueOrEmpty(kSpeechLevel)); kSpeechLevel);
// Maximum upwards change is limited. // Maximum upwards change is limited.
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -48.0f);
GetValueOrEmpty(-48.0f));
EXPECT_EQ(183, helper.manager.recommended_analog_level()); EXPECT_EQ(183, helper.manager.recommended_analog_level());
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -48.0f);
GetValueOrEmpty(-48.0f));
EXPECT_EQ(243, helper.manager.recommended_analog_level()); EXPECT_EQ(243, helper.manager.recommended_analog_level());
// Won't go higher than the maximum. // Won't go higher than the maximum.
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -48.0f);
GetValueOrEmpty(-48.0f));
EXPECT_EQ(255, helper.manager.recommended_analog_level()); EXPECT_EQ(255, helper.manager.recommended_analog_level());
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -17.0f);
GetValueOrEmpty(-17.0f));
EXPECT_EQ(254, helper.manager.recommended_analog_level()); EXPECT_EQ(254, helper.manager.recommended_analog_level());
// Maximum downwards change is limited. // Maximum downwards change is limited.
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, 22.0f);
GetValueOrEmpty(22.0f));
EXPECT_EQ(194, helper.manager.recommended_analog_level()); EXPECT_EQ(194, helper.manager.recommended_analog_level());
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, 22.0f);
GetValueOrEmpty(22.0f));
EXPECT_EQ(137, helper.manager.recommended_analog_level()); EXPECT_EQ(137, helper.manager.recommended_analog_level());
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, 22.0f);
GetValueOrEmpty(22.0f));
EXPECT_EQ(88, helper.manager.recommended_analog_level()); EXPECT_EQ(88, helper.manager.recommended_analog_level());
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, 22.0f);
GetValueOrEmpty(22.0f));
EXPECT_EQ(54, helper.manager.recommended_analog_level()); EXPECT_EQ(54, helper.manager.recommended_analog_level());
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, 22.0f);
GetValueOrEmpty(22.0f));
EXPECT_EQ(33, helper.manager.recommended_analog_level()); EXPECT_EQ(33, helper.manager.recommended_analog_level());
// Won't go lower than the minimum. // Won't go lower than the minimum.
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, 22.0f);
GetValueOrEmpty(22.0f));
EXPECT_EQ(std::max(18, GetMinMicLevel()), EXPECT_EQ(std::max(18, GetMinMicLevel()),
helper.manager.recommended_analog_level()); helper.manager.recommended_analog_level());
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, 22.0f);
GetValueOrEmpty(22.0f));
EXPECT_EQ(std::max(12, GetMinMicLevel()), EXPECT_EQ(std::max(12, GetMinMicLevel()),
helper.manager.recommended_analog_level()); helper.manager.recommended_analog_level());
} }
@ -521,17 +486,17 @@ TEST_P(InputVolumeControllerParametrizedTest, MicVolumeIsLimited) {
TEST_P(InputVolumeControllerParametrizedTest, NoActionWhileMuted) { TEST_P(InputVolumeControllerParametrizedTest, NoActionWhileMuted) {
InputVolumeControllerTestHelper helper; InputVolumeControllerTestHelper helper;
helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability, helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability,
GetValueOrEmpty(kSpeechLevel)); kSpeechLevel);
helper.manager.HandleCaptureOutputUsedChange(false); helper.manager.HandleCaptureOutputUsedChange(false);
helper.manager.Process(kHighSpeechProbability, GetValueOrEmpty(kSpeechLevel)); helper.manager.Process(kHighSpeechProbability, kSpeechLevel);
} }
TEST_P(InputVolumeControllerParametrizedTest, TEST_P(InputVolumeControllerParametrizedTest,
UnmutingChecksVolumeWithoutRaising) { UnmutingChecksVolumeWithoutRaising) {
InputVolumeControllerTestHelper helper; InputVolumeControllerTestHelper helper;
helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability, helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability,
GetValueOrEmpty(kSpeechLevel)); kSpeechLevel);
helper.manager.HandleCaptureOutputUsedChange(false); helper.manager.HandleCaptureOutputUsedChange(false);
helper.manager.HandleCaptureOutputUsedChange(true); helper.manager.HandleCaptureOutputUsedChange(true);
@ -540,15 +505,14 @@ TEST_P(InputVolumeControllerParametrizedTest,
helper.manager.set_stream_analog_level(kInputVolume); helper.manager.set_stream_analog_level(kInputVolume);
// SetMicVolume should not be called. // SetMicVolume should not be called.
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, kSpeechLevel);
GetValueOrEmpty(kSpeechLevel));
EXPECT_EQ(127, helper.manager.recommended_analog_level()); EXPECT_EQ(127, helper.manager.recommended_analog_level());
} }
TEST_P(InputVolumeControllerParametrizedTest, UnmutingRaisesTooLowVolume) { TEST_P(InputVolumeControllerParametrizedTest, UnmutingRaisesTooLowVolume) {
InputVolumeControllerTestHelper helper; InputVolumeControllerTestHelper helper;
helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability, helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability,
GetValueOrEmpty(kSpeechLevel)); kSpeechLevel);
helper.manager.HandleCaptureOutputUsedChange(false); helper.manager.HandleCaptureOutputUsedChange(false);
helper.manager.HandleCaptureOutputUsedChange(true); helper.manager.HandleCaptureOutputUsedChange(true);
@ -556,8 +520,7 @@ TEST_P(InputVolumeControllerParametrizedTest, UnmutingRaisesTooLowVolume) {
constexpr int kInputVolume = 11; constexpr int kInputVolume = 11;
helper.manager.set_stream_analog_level(kInputVolume); helper.manager.set_stream_analog_level(kInputVolume);
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, kSpeechLevel);
GetValueOrEmpty(kSpeechLevel));
EXPECT_EQ(GetMinMicLevel(), helper.manager.recommended_analog_level()); EXPECT_EQ(GetMinMicLevel(), helper.manager.recommended_analog_level());
} }
@ -565,25 +528,22 @@ TEST_P(InputVolumeControllerParametrizedTest,
ManualLevelChangeResultsInNoSetMicCall) { ManualLevelChangeResultsInNoSetMicCall) {
InputVolumeControllerTestHelper helper; InputVolumeControllerTestHelper helper;
helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability, helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability,
GetValueOrEmpty(kSpeechLevel)); kSpeechLevel);
// GetMicVolume returns a value outside of the quantization slack, indicating // GetMicVolume returns a value outside of the quantization slack, indicating
// a manual volume change. // a manual volume change.
ASSERT_NE(helper.manager.recommended_analog_level(), 154); ASSERT_NE(helper.manager.recommended_analog_level(), 154);
helper.manager.set_stream_analog_level(154); helper.manager.set_stream_analog_level(154);
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -29.0f);
GetValueOrEmpty(-29.0f));
EXPECT_EQ(154, helper.manager.recommended_analog_level()); EXPECT_EQ(154, helper.manager.recommended_analog_level());
// Do the same thing, except downwards now. // Do the same thing, except downwards now.
helper.manager.set_stream_analog_level(100); helper.manager.set_stream_analog_level(100);
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -17.0f);
GetValueOrEmpty(-17.0f));
EXPECT_EQ(100, helper.manager.recommended_analog_level()); EXPECT_EQ(100, helper.manager.recommended_analog_level());
// And finally verify the AGC continues working without a manual change. // And finally verify the AGC continues working without a manual change.
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -17.0f);
GetValueOrEmpty(-17.0f));
EXPECT_EQ(99, helper.manager.recommended_analog_level()); EXPECT_EQ(99, helper.manager.recommended_analog_level());
} }
@ -591,29 +551,24 @@ TEST_P(InputVolumeControllerParametrizedTest,
RecoveryAfterManualLevelChangeFromMax) { RecoveryAfterManualLevelChangeFromMax) {
InputVolumeControllerTestHelper helper; InputVolumeControllerTestHelper helper;
helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability, helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability,
GetValueOrEmpty(kSpeechLevel)); kSpeechLevel);
// Force the mic up to max volume. Takes a few steps due to the residual // Force the mic up to max volume. Takes a few steps due to the residual
// gain limitation. // gain limitation.
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -48.0f);
GetValueOrEmpty(-48.0f));
EXPECT_EQ(183, helper.manager.recommended_analog_level()); EXPECT_EQ(183, helper.manager.recommended_analog_level());
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -48.0f);
GetValueOrEmpty(-48.0f));
EXPECT_EQ(243, helper.manager.recommended_analog_level()); EXPECT_EQ(243, helper.manager.recommended_analog_level());
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -48.0f);
GetValueOrEmpty(-48.0f));
EXPECT_EQ(255, helper.manager.recommended_analog_level()); EXPECT_EQ(255, helper.manager.recommended_analog_level());
// Manual change does not result in SetMicVolume call. // Manual change does not result in SetMicVolume call.
helper.manager.set_stream_analog_level(50); helper.manager.set_stream_analog_level(50);
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -17.0f);
GetValueOrEmpty(-17.0f));
EXPECT_EQ(50, helper.manager.recommended_analog_level()); EXPECT_EQ(50, helper.manager.recommended_analog_level());
// Continues working as usual afterwards. // Continues working as usual afterwards.
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -38.0f);
GetValueOrEmpty(-38.0f));
EXPECT_EQ(65, helper.manager.recommended_analog_level()); EXPECT_EQ(65, helper.manager.recommended_analog_level());
} }
@ -629,26 +584,22 @@ TEST_P(InputVolumeControllerParametrizedTest,
InputVolumeControllerTestHelper helper; InputVolumeControllerTestHelper helper;
helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability, helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability,
GetValueOrEmpty(kSpeechLevel)); kSpeechLevel);
// Manual change below min, but strictly positive, otherwise AGC won't take // Manual change below min, but strictly positive, otherwise AGC won't take
// any action. // any action.
helper.manager.set_stream_analog_level(1); helper.manager.set_stream_analog_level(1);
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -17.0f);
GetValueOrEmpty(-17.0f));
EXPECT_EQ(1, helper.manager.recommended_analog_level()); EXPECT_EQ(1, helper.manager.recommended_analog_level());
// Continues working as usual afterwards. // Continues working as usual afterwards.
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -29.0f);
GetValueOrEmpty(-29.0f));
EXPECT_EQ(1, helper.manager.recommended_analog_level()); EXPECT_EQ(1, helper.manager.recommended_analog_level());
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -48.0f);
GetValueOrEmpty(-48.0f));
EXPECT_EQ(10, helper.manager.recommended_analog_level()); EXPECT_EQ(10, helper.manager.recommended_analog_level());
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -38.0f);
GetValueOrEmpty(-38.0f));
EXPECT_EQ(16, helper.manager.recommended_analog_level()); EXPECT_EQ(16, helper.manager.recommended_analog_level());
} }
@ -663,20 +614,19 @@ TEST_P(InputVolumeControllerParametrizedTest,
InputVolumeControllerTestHelper helper; InputVolumeControllerTestHelper helper;
helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability, helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability,
GetValueOrEmpty(kSpeechLevel)); kSpeechLevel);
// Manual change below min, but strictly positive, otherwise // Manual change below min, but strictly positive, otherwise
// AGC won't take any action. // AGC won't take any action.
helper.manager.set_stream_analog_level(1); helper.manager.set_stream_analog_level(1);
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -17.0f);
GetValueOrEmpty(-17.0f));
EXPECT_EQ(GetMinMicLevel(), helper.manager.recommended_analog_level()); EXPECT_EQ(GetMinMicLevel(), helper.manager.recommended_analog_level());
} }
TEST_P(InputVolumeControllerParametrizedTest, NoClippingHasNoImpact) { TEST_P(InputVolumeControllerParametrizedTest, NoClippingHasNoImpact) {
InputVolumeControllerTestHelper helper; InputVolumeControllerTestHelper helper;
helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability, helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability,
GetValueOrEmpty(kSpeechLevel)); kSpeechLevel);
helper.CallPreProc(/*num_calls=*/100, /*clipped_ratio=*/0); helper.CallPreProc(/*num_calls=*/100, /*clipped_ratio=*/0);
EXPECT_EQ(128, helper.manager.recommended_analog_level()); EXPECT_EQ(128, helper.manager.recommended_analog_level());
@ -686,7 +636,7 @@ TEST_P(InputVolumeControllerParametrizedTest,
ClippingUnderThresholdHasNoImpact) { ClippingUnderThresholdHasNoImpact) {
InputVolumeControllerTestHelper helper; InputVolumeControllerTestHelper helper;
helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability, helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability,
GetValueOrEmpty(kSpeechLevel)); kSpeechLevel);
helper.CallPreProc(/*num_calls=*/1, /*clipped_ratio=*/0.099); helper.CallPreProc(/*num_calls=*/1, /*clipped_ratio=*/0.099);
EXPECT_EQ(128, helper.manager.recommended_analog_level()); EXPECT_EQ(128, helper.manager.recommended_analog_level());
@ -695,7 +645,7 @@ TEST_P(InputVolumeControllerParametrizedTest,
TEST_P(InputVolumeControllerParametrizedTest, ClippingLowersVolume) { TEST_P(InputVolumeControllerParametrizedTest, ClippingLowersVolume) {
InputVolumeControllerTestHelper helper; InputVolumeControllerTestHelper helper;
helper.CallAgcSequence(/*applied_input_volume=*/255, kHighSpeechProbability, helper.CallAgcSequence(/*applied_input_volume=*/255, kHighSpeechProbability,
GetValueOrEmpty(kSpeechLevel)); kSpeechLevel);
helper.CallPreProc(/*num_calls=*/1, /*clipped_ratio=*/0.2); helper.CallPreProc(/*num_calls=*/1, /*clipped_ratio=*/0.2);
EXPECT_EQ(240, helper.manager.recommended_analog_level()); EXPECT_EQ(240, helper.manager.recommended_analog_level());
@ -705,7 +655,7 @@ TEST_P(InputVolumeControllerParametrizedTest,
WaitingPeriodBetweenClippingChecks) { WaitingPeriodBetweenClippingChecks) {
InputVolumeControllerTestHelper helper; InputVolumeControllerTestHelper helper;
helper.CallAgcSequence(/*applied_input_volume=*/255, kHighSpeechProbability, helper.CallAgcSequence(/*applied_input_volume=*/255, kHighSpeechProbability,
GetValueOrEmpty(kSpeechLevel)); kSpeechLevel);
helper.CallPreProc(/*num_calls=*/1, /*clipped_ratio=*/kAboveClippedThreshold); helper.CallPreProc(/*num_calls=*/1, /*clipped_ratio=*/kAboveClippedThreshold);
EXPECT_EQ(240, helper.manager.recommended_analog_level()); EXPECT_EQ(240, helper.manager.recommended_analog_level());
@ -721,7 +671,7 @@ TEST_P(InputVolumeControllerParametrizedTest,
TEST_P(InputVolumeControllerParametrizedTest, ClippingLoweringIsLimited) { TEST_P(InputVolumeControllerParametrizedTest, ClippingLoweringIsLimited) {
InputVolumeControllerTestHelper helper; InputVolumeControllerTestHelper helper;
helper.CallAgcSequence(/*applied_input_volume=*/180, kHighSpeechProbability, helper.CallAgcSequence(/*applied_input_volume=*/180, kHighSpeechProbability,
GetValueOrEmpty(kSpeechLevel)); kSpeechLevel);
helper.CallPreProc(/*num_calls=*/1, /*clipped_ratio=*/kAboveClippedThreshold); helper.CallPreProc(/*num_calls=*/1, /*clipped_ratio=*/kAboveClippedThreshold);
EXPECT_EQ(kClippedMin, helper.manager.recommended_analog_level()); EXPECT_EQ(kClippedMin, helper.manager.recommended_analog_level());
@ -735,13 +685,12 @@ TEST_P(InputVolumeControllerParametrizedTest,
ClippingMaxIsRespectedWhenEqualToLevel) { ClippingMaxIsRespectedWhenEqualToLevel) {
InputVolumeControllerTestHelper helper; InputVolumeControllerTestHelper helper;
helper.CallAgcSequence(/*applied_input_volume=*/255, kHighSpeechProbability, helper.CallAgcSequence(/*applied_input_volume=*/255, kHighSpeechProbability,
GetValueOrEmpty(kSpeechLevel)); kSpeechLevel);
helper.CallPreProc(/*num_calls=*/1, /*clipped_ratio=*/kAboveClippedThreshold); helper.CallPreProc(/*num_calls=*/1, /*clipped_ratio=*/kAboveClippedThreshold);
EXPECT_EQ(240, helper.manager.recommended_analog_level()); EXPECT_EQ(240, helper.manager.recommended_analog_level());
helper.CallProcess(/*num_calls=*/10, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/10, kHighSpeechProbability, -48.0f);
GetValueOrEmpty(-48.0f));
EXPECT_EQ(240, helper.manager.recommended_analog_level()); EXPECT_EQ(240, helper.manager.recommended_analog_level());
} }
@ -749,44 +698,38 @@ TEST_P(InputVolumeControllerParametrizedTest,
ClippingMaxIsRespectedWhenHigherThanLevel) { ClippingMaxIsRespectedWhenHigherThanLevel) {
InputVolumeControllerTestHelper helper; InputVolumeControllerTestHelper helper;
helper.CallAgcSequence(/*applied_input_volume=*/200, kHighSpeechProbability, helper.CallAgcSequence(/*applied_input_volume=*/200, kHighSpeechProbability,
GetValueOrEmpty(kSpeechLevel)); kSpeechLevel);
helper.CallPreProc(/*num_calls=*/1, /*clipped_ratio=*/kAboveClippedThreshold); helper.CallPreProc(/*num_calls=*/1, /*clipped_ratio=*/kAboveClippedThreshold);
EXPECT_EQ(185, helper.manager.recommended_analog_level()); EXPECT_EQ(185, helper.manager.recommended_analog_level());
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -58.0f);
GetValueOrEmpty(-58.0f));
EXPECT_EQ(240, helper.manager.recommended_analog_level()); EXPECT_EQ(240, helper.manager.recommended_analog_level());
helper.CallProcess(/*num_calls=*/10, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/10, kHighSpeechProbability, -58.0f);
GetValueOrEmpty(-58.0f));
EXPECT_EQ(240, helper.manager.recommended_analog_level()); EXPECT_EQ(240, helper.manager.recommended_analog_level());
} }
TEST_P(InputVolumeControllerParametrizedTest, UserCanRaiseVolumeAfterClipping) { TEST_P(InputVolumeControllerParametrizedTest, UserCanRaiseVolumeAfterClipping) {
InputVolumeControllerTestHelper helper; InputVolumeControllerTestHelper helper;
helper.CallAgcSequence(/*applied_input_volume=*/225, kHighSpeechProbability, helper.CallAgcSequence(/*applied_input_volume=*/225, kHighSpeechProbability,
GetValueOrEmpty(kSpeechLevel)); kSpeechLevel);
helper.CallPreProc(/*num_calls=*/1, /*clipped_ratio=*/kAboveClippedThreshold); helper.CallPreProc(/*num_calls=*/1, /*clipped_ratio=*/kAboveClippedThreshold);
EXPECT_EQ(210, helper.manager.recommended_analog_level()); EXPECT_EQ(210, helper.manager.recommended_analog_level());
// User changed the volume. // User changed the volume.
helper.manager.set_stream_analog_level(250); helper.manager.set_stream_analog_level(250);
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -32.0f);
GetValueOrEmpty(-32.0f));
EXPECT_EQ(250, helper.manager.recommended_analog_level()); EXPECT_EQ(250, helper.manager.recommended_analog_level());
// Move down... // Move down...
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -8.0f);
GetValueOrEmpty(-8.0f));
EXPECT_EQ(210, helper.manager.recommended_analog_level()); EXPECT_EQ(210, helper.manager.recommended_analog_level());
// And back up to the new max established by the user. // And back up to the new max established by the user.
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -58.0f);
GetValueOrEmpty(-58.0f));
EXPECT_EQ(250, helper.manager.recommended_analog_level()); EXPECT_EQ(250, helper.manager.recommended_analog_level());
// Will not move above new maximum. // Will not move above new maximum.
helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/1, kHighSpeechProbability, -48.0f);
GetValueOrEmpty(-48.0f));
EXPECT_EQ(250, helper.manager.recommended_analog_level()); EXPECT_EQ(250, helper.manager.recommended_analog_level());
} }
@ -794,7 +737,7 @@ TEST_P(InputVolumeControllerParametrizedTest,
ClippingDoesNotPullLowVolumeBackUp) { ClippingDoesNotPullLowVolumeBackUp) {
InputVolumeControllerTestHelper helper; InputVolumeControllerTestHelper helper;
helper.CallAgcSequence(/*applied_input_volume=*/80, kHighSpeechProbability, helper.CallAgcSequence(/*applied_input_volume=*/80, kHighSpeechProbability,
GetValueOrEmpty(kSpeechLevel)); kSpeechLevel);
int initial_volume = helper.manager.recommended_analog_level(); int initial_volume = helper.manager.recommended_analog_level();
helper.CallPreProc(/*num_calls=*/1, /*clipped_ratio=*/kAboveClippedThreshold); helper.CallPreProc(/*num_calls=*/1, /*clipped_ratio=*/kAboveClippedThreshold);
@ -804,18 +747,17 @@ TEST_P(InputVolumeControllerParametrizedTest,
TEST_P(InputVolumeControllerParametrizedTest, TakesNoActionOnZeroMicVolume) { TEST_P(InputVolumeControllerParametrizedTest, TakesNoActionOnZeroMicVolume) {
InputVolumeControllerTestHelper helper; InputVolumeControllerTestHelper helper;
helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability, helper.CallAgcSequence(kInitialInputVolume, kHighSpeechProbability,
GetValueOrEmpty(kSpeechLevel)); kSpeechLevel);
helper.manager.set_stream_analog_level(0); helper.manager.set_stream_analog_level(0);
helper.CallProcess(/*num_calls=*/10, kHighSpeechProbability, helper.CallProcess(/*num_calls=*/10, kHighSpeechProbability, -48.0f);
GetValueOrEmpty(-48.0f));
EXPECT_EQ(0, helper.manager.recommended_analog_level()); EXPECT_EQ(0, helper.manager.recommended_analog_level());
} }
TEST_P(InputVolumeControllerParametrizedTest, ClippingDetectionLowersVolume) { TEST_P(InputVolumeControllerParametrizedTest, ClippingDetectionLowersVolume) {
InputVolumeControllerTestHelper helper; InputVolumeControllerTestHelper helper;
helper.CallAgcSequence(/*applied_input_volume=*/255, kHighSpeechProbability, helper.CallAgcSequence(/*applied_input_volume=*/255, kHighSpeechProbability,
GetValueOrEmpty(kSpeechLevel)); kSpeechLevel);
EXPECT_EQ(255, helper.manager.recommended_analog_level()); EXPECT_EQ(255, helper.manager.recommended_analog_level());
helper.CallPreProcForChangingAudio(/*num_calls=*/100, /*peak_ratio=*/0.99f); helper.CallPreProcForChangingAudio(/*num_calls=*/100, /*peak_ratio=*/0.99f);
@ -828,7 +770,7 @@ TEST_P(InputVolumeControllerParametrizedTest,
DisabledClippingPredictorDoesNotLowerVolume) { DisabledClippingPredictorDoesNotLowerVolume) {
InputVolumeControllerTestHelper helper; InputVolumeControllerTestHelper helper;
helper.CallAgcSequence(/*applied_input_volume=*/255, kHighSpeechProbability, helper.CallAgcSequence(/*applied_input_volume=*/255, kHighSpeechProbability,
GetValueOrEmpty(kSpeechLevel)); kSpeechLevel);
EXPECT_FALSE(helper.manager.clipping_predictor_enabled()); EXPECT_FALSE(helper.manager.clipping_predictor_enabled());
EXPECT_EQ(255, helper.manager.recommended_analog_level()); EXPECT_EQ(255, helper.manager.recommended_analog_level());
@ -1136,10 +1078,6 @@ TEST(InputVolumeControllerTest,
// TODO(bugs.webrtc.org/12774): Test the bahavior of `clipped_wait_frames`. // TODO(bugs.webrtc.org/12774): Test the bahavior of `clipped_wait_frames`.
// Verifies that configurable clipping parameters are initialized as intended. // Verifies that configurable clipping parameters are initialized as intended.
TEST_P(InputVolumeControllerParametrizedTest, ClippingParametersVerified) { TEST_P(InputVolumeControllerParametrizedTest, ClippingParametersVerified) {
if (RmsErrorHasValue()) {
GTEST_SKIP() << "Skipped. RMS error does not affect the test.";
}
std::unique_ptr<InputVolumeController> manager = CreateInputVolumeController( std::unique_ptr<InputVolumeController> manager = CreateInputVolumeController(
kClippedLevelStep, kClippedRatioThreshold, kClippedWaitFrames); kClippedLevelStep, kClippedRatioThreshold, kClippedWaitFrames);
manager->Initialize(); manager->Initialize();
@ -1158,10 +1096,6 @@ TEST_P(InputVolumeControllerParametrizedTest, ClippingParametersVerified) {
TEST_P(InputVolumeControllerParametrizedTest, TEST_P(InputVolumeControllerParametrizedTest,
DisableClippingPredictorDisablesClippingPredictor) { DisableClippingPredictorDisablesClippingPredictor) {
if (RmsErrorHasValue()) {
GTEST_SKIP() << "Skipped. RMS error does not affect the test.";
}
std::unique_ptr<InputVolumeController> manager = CreateInputVolumeController( std::unique_ptr<InputVolumeController> manager = CreateInputVolumeController(
kClippedLevelStep, kClippedRatioThreshold, kClippedWaitFrames, kClippedLevelStep, kClippedRatioThreshold, kClippedWaitFrames,
/*enable_clipping_predictor=*/false); /*enable_clipping_predictor=*/false);
@ -1171,22 +1105,8 @@ TEST_P(InputVolumeControllerParametrizedTest,
EXPECT_FALSE(manager->use_clipping_predictor_step()); EXPECT_FALSE(manager->use_clipping_predictor_step());
} }
TEST_P(InputVolumeControllerParametrizedTest,
ClippingPredictorDisabledByDefault) {
if (RmsErrorHasValue()) {
GTEST_SKIP() << "Skipped. RMS error does not affect the test.";
}
constexpr ClippingPredictorConfig kDefaultConfig;
EXPECT_FALSE(kDefaultConfig.enabled);
}
TEST_P(InputVolumeControllerParametrizedTest, TEST_P(InputVolumeControllerParametrizedTest,
EnableClippingPredictorEnablesClippingPredictor) { EnableClippingPredictorEnablesClippingPredictor) {
if (RmsErrorHasValue()) {
GTEST_SKIP() << "Skipped. RMS error does not affect the test.";
}
std::unique_ptr<InputVolumeController> manager = CreateInputVolumeController( std::unique_ptr<InputVolumeController> manager = CreateInputVolumeController(
kClippedLevelStep, kClippedRatioThreshold, kClippedWaitFrames, kClippedLevelStep, kClippedRatioThreshold, kClippedWaitFrames,
/*enable_clipping_predictor=*/true); /*enable_clipping_predictor=*/true);
@ -1209,7 +1129,7 @@ TEST_P(InputVolumeControllerParametrizedTest,
EXPECT_FALSE(manager.clipping_predictor_enabled()); EXPECT_FALSE(manager.clipping_predictor_enabled());
EXPECT_FALSE(manager.use_clipping_predictor_step()); EXPECT_FALSE(manager.use_clipping_predictor_step());
EXPECT_EQ(manager.recommended_analog_level(), 255); EXPECT_EQ(manager.recommended_analog_level(), 255);
manager.Process(kHighSpeechProbability, GetValueOrEmpty(kSpeechLevel)); manager.Process(kHighSpeechProbability, kSpeechLevel);
CallPreProcessAudioBuffer(/*num_calls=*/10, /*peak_ratio=*/0.99f, manager); CallPreProcessAudioBuffer(/*num_calls=*/10, /*peak_ratio=*/0.99f, manager);
EXPECT_EQ(manager.recommended_analog_level(), 255); EXPECT_EQ(manager.recommended_analog_level(), 255);
CallPreProcessAudioBuffer(/*num_calls=*/300, /*peak_ratio=*/0.99f, manager); CallPreProcessAudioBuffer(/*num_calls=*/300, /*peak_ratio=*/0.99f, manager);
@ -1246,10 +1166,8 @@ TEST_P(InputVolumeControllerParametrizedTest,
manager_with_prediction.set_stream_analog_level(kInitialLevel); manager_with_prediction.set_stream_analog_level(kInitialLevel);
manager_without_prediction.set_stream_analog_level(kInitialLevel); manager_without_prediction.set_stream_analog_level(kInitialLevel);
manager_with_prediction.Process(kHighSpeechProbability, manager_with_prediction.Process(kHighSpeechProbability, kSpeechLevel);
GetValueOrEmpty(kSpeechLevel)); manager_without_prediction.Process(kHighSpeechProbability, kSpeechLevel);
manager_without_prediction.Process(kHighSpeechProbability,
GetValueOrEmpty(kSpeechLevel));
EXPECT_TRUE(manager_with_prediction.clipping_predictor_enabled()); EXPECT_TRUE(manager_with_prediction.clipping_predictor_enabled());
EXPECT_FALSE(manager_without_prediction.clipping_predictor_enabled()); EXPECT_FALSE(manager_without_prediction.clipping_predictor_enabled());