This CL adds functionality in the level controller to
receive a signal level to use initially, instead of the
default initial signal level.
The initial form of the CL
(https://codereview.webrtc.org/2254973003/) was reverted
due to down-stream dependencies. These have been resolved,
but the CL needed to be revised according to the new scheme
for passing parameters to the audio processing module.
Therefore, please review this CL as if it is new.
TBR=aleloi@webrtc.org
BUG=webrtc:6386
Review-Url: https://codereview.webrtc.org/2337083002
Cr-Commit-Position: refs/heads/master@{#14579}
diff --git a/webrtc/modules/audio_processing/audio_processing_unittest.cc b/webrtc/modules/audio_processing/audio_processing_unittest.cc
index 6e0b175..d4faa81 100644
--- a/webrtc/modules/audio_processing/audio_processing_unittest.cc
+++ b/webrtc/modules/audio_processing/audio_processing_unittest.cc
@@ -18,14 +18,17 @@
#include "webrtc/base/arraysize.h"
#include "webrtc/base/checks.h"
+#include "webrtc/base/gtest_prod_util.h"
#include "webrtc/base/ignore_wundef.h"
#include "webrtc/common_audio/include/audio_util.h"
#include "webrtc/common_audio/resampler/include/push_resampler.h"
#include "webrtc/common_audio/resampler/push_sinc_resampler.h"
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
+#include "webrtc/modules/audio_processing/audio_processing_impl.h"
#include "webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h"
#include "webrtc/modules/audio_processing/common.h"
#include "webrtc/modules/audio_processing/include/audio_processing.h"
+#include "webrtc/modules/audio_processing/level_controller/level_controller_constants.h"
#include "webrtc/modules/audio_processing/test/protobuf_utils.h"
#include "webrtc/modules/audio_processing/test/test_utils.h"
#include "webrtc/modules/include/module_common_types.h"
@@ -2782,4 +2785,97 @@
#endif
} // namespace
+
+TEST(ApmConfiguration, DefaultBehavior) {
+ // Verify that the level controller is default off, it can be activated using
+ // the config, and that the default initial level is maintained after the
+ // config has been applied.
+ std::unique_ptr<AudioProcessingImpl> apm(
+ new AudioProcessingImpl(webrtc::Config()));
+ AudioProcessing::Config config;
+ EXPECT_FALSE(apm->config_.level_controller.enabled);
+ // TODO(peah): Add test for the existence of the level controller object once
+ // that is created only when that is specified in the config.
+ // TODO(peah): Remove the testing for
+ // apm->capture_nonlocked_.level_controller_enabled once the value in config_
+ // is instead used to activate the level controller.
+ EXPECT_FALSE(apm->capture_nonlocked_.level_controller_enabled);
+ EXPECT_NEAR(kTargetLcPeakLeveldBFS,
+ apm->config_.level_controller.initial_peak_level_dbfs,
+ std::numeric_limits<float>::epsilon());
+ config.level_controller.enabled = true;
+ apm->ApplyConfig(config);
+ EXPECT_TRUE(apm->config_.level_controller.enabled);
+ // TODO(peah): Add test for the existence of the level controller object once
+ // that is created only when the that is specified in the config.
+ // TODO(peah): Remove the testing for
+ // apm->capture_nonlocked_.level_controller_enabled once the value in config_
+ // is instead used to activate the level controller.
+ EXPECT_TRUE(apm->capture_nonlocked_.level_controller_enabled);
+ EXPECT_NEAR(kTargetLcPeakLeveldBFS,
+ apm->config_.level_controller.initial_peak_level_dbfs,
+ std::numeric_limits<float>::epsilon());
+}
+
+TEST(ApmConfiguration, ValidConfigBehavior) {
+ // Verify that the initial level can be specified and is retained after the
+ // config has been applied.
+ std::unique_ptr<AudioProcessingImpl> apm(
+ new AudioProcessingImpl(webrtc::Config()));
+ AudioProcessing::Config config;
+ config.level_controller.initial_peak_level_dbfs = -50.f;
+ apm->ApplyConfig(config);
+ EXPECT_FALSE(apm->config_.level_controller.enabled);
+ // TODO(peah): Add test for the existence of the level controller object once
+ // that is created only when the that is specified in the config.
+ // TODO(peah): Remove the testing for
+ // apm->capture_nonlocked_.level_controller_enabled once the value in config_
+ // is instead used to activate the level controller.
+ EXPECT_FALSE(apm->capture_nonlocked_.level_controller_enabled);
+ EXPECT_NEAR(-50.f, apm->config_.level_controller.initial_peak_level_dbfs,
+ std::numeric_limits<float>::epsilon());
+}
+
+TEST(ApmConfiguration, InValidConfigBehavior) {
+ // Verify that the config is properly reset when nonproper values are applied
+ // for the initial level.
+
+ // Verify that the config is properly reset when the specified initial peak
+ // level is too low.
+ std::unique_ptr<AudioProcessingImpl> apm(
+ new AudioProcessingImpl(webrtc::Config()));
+ AudioProcessing::Config config;
+ config.level_controller.enabled = true;
+ config.level_controller.initial_peak_level_dbfs = -101.f;
+ apm->ApplyConfig(config);
+ EXPECT_FALSE(apm->config_.level_controller.enabled);
+ // TODO(peah): Add test for the existence of the level controller object once
+ // that is created only when the that is specified in the config.
+ // TODO(peah): Remove the testing for
+ // apm->capture_nonlocked_.level_controller_enabled once the value in config_
+ // is instead used to activate the level controller.
+ EXPECT_FALSE(apm->capture_nonlocked_.level_controller_enabled);
+ EXPECT_NEAR(kTargetLcPeakLeveldBFS,
+ apm->config_.level_controller.initial_peak_level_dbfs,
+ std::numeric_limits<float>::epsilon());
+
+ // Verify that the config is properly reset when the specified initial peak
+ // level is too high.
+ apm.reset(new AudioProcessingImpl(webrtc::Config()));
+ config = AudioProcessing::Config();
+ config.level_controller.enabled = true;
+ config.level_controller.initial_peak_level_dbfs = 1.f;
+ apm->ApplyConfig(config);
+ EXPECT_FALSE(apm->config_.level_controller.enabled);
+ // TODO(peah): Add test for the existence of the level controller object once
+ // that is created only when that is specified in the config.
+ // TODO(peah): Remove the testing for
+ // apm->capture_nonlocked_.level_controller_enabled once the value in config_
+ // is instead used to activate the level controller.
+ EXPECT_FALSE(apm->capture_nonlocked_.level_controller_enabled);
+ EXPECT_NEAR(kTargetLcPeakLeveldBFS,
+ apm->config_.level_controller.initial_peak_level_dbfs,
+ std::numeric_limits<float>::epsilon());
+}
+
} // namespace webrtc