Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(188)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/modules/audio_processing/test/debug_dump_test.cc

Issue 2334583002: Revert of Introduced new scheme for controlling the functionality inside the audio processing module (Closed)
Patch Set: Created 4 years, 3 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/test/audio_processing_simulator.cc ('k') | webrtc/modules/audio_processing/test/process_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_processing/test/debug_dump_test.cc
diff --git a/webrtc/modules/audio_processing/test/debug_dump_test.cc b/webrtc/modules/audio_processing/test/debug_dump_test.cc
index 99873429ea283d50f71afb0a9a7eb6bc9c18e036..103f8e109aadf15a0de5b70ef7db99b236fa94bc 100644
--- a/webrtc/modules/audio_processing/test/debug_dump_test.cc
+++ b/webrtc/modules/audio_processing/test/debug_dump_test.cc
@@ -48,8 +48,7 @@
const std::string& dump_file_name);
// Constructor that uses default input files.
- explicit DebugDumpGenerator(const Config& config,
- const AudioProcessing::Config& apm_config);
+ explicit DebugDumpGenerator(const Config& config);
~DebugDumpGenerator();
@@ -134,18 +133,11 @@
dump_file_name_(dump_file_name) {
}
-DebugDumpGenerator::DebugDumpGenerator(
- const Config& config,
- const AudioProcessing::Config& apm_config)
- : DebugDumpGenerator(ResourcePath("near32_stereo", "pcm"),
- 32000,
- 2,
- ResourcePath("far32_stereo", "pcm"),
- 32000,
- 2,
- config,
- TempFilename(OutputPath(), "debug_aec")) {
- apm_->ApplyConfig(apm_config);
+DebugDumpGenerator::DebugDumpGenerator(const Config& config)
+ : DebugDumpGenerator(ResourcePath("near32_stereo", "pcm"), 32000, 2,
+ ResourcePath("far32_stereo", "pcm"), 32000, 2,
+ config,
+ TempFilename(OutputPath(), "debug_aec")) {
}
DebugDumpGenerator::~DebugDumpGenerator() {
@@ -273,7 +265,7 @@
TEST_F(DebugDumpTest, SimpleCase) {
Config config;
- DebugDumpGenerator generator(config, AudioProcessing::Config());
+ DebugDumpGenerator generator(config);
generator.StartRecording();
generator.Process(100);
generator.StopRecording();
@@ -282,8 +274,7 @@
TEST_F(DebugDumpTest, ChangeInputFormat) {
Config config;
- DebugDumpGenerator generator(config, AudioProcessing::Config());
-
+ DebugDumpGenerator generator(config);
generator.StartRecording();
generator.Process(100);
generator.SetInputRate(48000);
@@ -300,7 +291,7 @@
TEST_F(DebugDumpTest, ChangeReverseFormat) {
Config config;
- DebugDumpGenerator generator(config, AudioProcessing::Config());
+ DebugDumpGenerator generator(config);
generator.StartRecording();
generator.Process(100);
generator.SetReverseRate(48000);
@@ -312,7 +303,7 @@
TEST_F(DebugDumpTest, ChangeOutputFormat) {
Config config;
- DebugDumpGenerator generator(config, AudioProcessing::Config());
+ DebugDumpGenerator generator(config);
generator.StartRecording();
generator.Process(100);
generator.SetOutputRate(48000);
@@ -324,7 +315,7 @@
TEST_F(DebugDumpTest, ToggleAec) {
Config config;
- DebugDumpGenerator generator(config, AudioProcessing::Config());
+ DebugDumpGenerator generator(config);
generator.StartRecording();
generator.Process(100);
@@ -339,7 +330,7 @@
TEST_F(DebugDumpTest, ToggleDelayAgnosticAec) {
Config config;
config.Set<DelayAgnostic>(new DelayAgnostic(true));
- DebugDumpGenerator generator(config, AudioProcessing::Config());
+ DebugDumpGenerator generator(config);
generator.StartRecording();
generator.Process(100);
@@ -354,7 +345,7 @@
TEST_F(DebugDumpTest, VerifyRefinedAdaptiveFilterExperimentalString) {
Config config;
config.Set<RefinedAdaptiveFilter>(new RefinedAdaptiveFilter(true));
- DebugDumpGenerator generator(config, AudioProcessing::Config());
+ DebugDumpGenerator generator(config);
generator.StartRecording();
generator.Process(100);
generator.StopRecording();
@@ -379,7 +370,7 @@
Config config;
config.Set<RefinedAdaptiveFilter>(new RefinedAdaptiveFilter(true));
config.Set<EchoCanceller3>(new EchoCanceller3(true));
- DebugDumpGenerator generator(config, AudioProcessing::Config());
+ DebugDumpGenerator generator(config);
generator.StartRecording();
generator.Process(100);
generator.StopRecording();
@@ -405,7 +396,7 @@
TEST_F(DebugDumpTest, VerifyCombinedExperimentalStringExclusive) {
Config config;
config.Set<RefinedAdaptiveFilter>(new RefinedAdaptiveFilter(true));
- DebugDumpGenerator generator(config, AudioProcessing::Config());
+ DebugDumpGenerator generator(config);
generator.StartRecording();
generator.Process(100);
generator.StopRecording();
@@ -431,7 +422,7 @@
TEST_F(DebugDumpTest, VerifyAec3ExperimentalString) {
Config config;
config.Set<EchoCanceller3>(new EchoCanceller3(true));
- DebugDumpGenerator generator(config, AudioProcessing::Config());
+ DebugDumpGenerator generator(config);
generator.StartRecording();
generator.Process(100);
generator.StopRecording();
@@ -454,9 +445,8 @@
TEST_F(DebugDumpTest, VerifyLevelControllerExperimentalString) {
Config config;
- AudioProcessing::Config apm_config;
- apm_config.level_controller.enabled = true;
- DebugDumpGenerator generator(config, apm_config);
+ config.Set<LevelControl>(new LevelControl(true));
+ DebugDumpGenerator generator(config);
generator.StartRecording();
generator.Process(100);
generator.StopRecording();
@@ -479,7 +469,7 @@
TEST_F(DebugDumpTest, VerifyEmptyExperimentalString) {
Config config;
- DebugDumpGenerator generator(config, AudioProcessing::Config());
+ DebugDumpGenerator generator(config);
generator.StartRecording();
generator.Process(100);
generator.StopRecording();
@@ -501,7 +491,7 @@
TEST_F(DebugDumpTest, ToggleAecLevel) {
Config config;
- DebugDumpGenerator generator(config, AudioProcessing::Config());
+ DebugDumpGenerator generator(config);
EchoCancellation* aec = generator.apm()->echo_cancellation();
EXPECT_EQ(AudioProcessing::kNoError, aec->Enable(true));
EXPECT_EQ(AudioProcessing::kNoError,
@@ -524,7 +514,7 @@
#endif
TEST_F(DebugDumpTest, MAYBE_ToggleAgc) {
Config config;
- DebugDumpGenerator generator(config, AudioProcessing::Config());
+ DebugDumpGenerator generator(config);
generator.StartRecording();
generator.Process(100);
@@ -538,7 +528,7 @@
TEST_F(DebugDumpTest, ToggleNs) {
Config config;
- DebugDumpGenerator generator(config, AudioProcessing::Config());
+ DebugDumpGenerator generator(config);
generator.StartRecording();
generator.Process(100);
@@ -553,7 +543,7 @@
TEST_F(DebugDumpTest, TransientSuppressionOn) {
Config config;
config.Set<ExperimentalNs>(new ExperimentalNs(true));
- DebugDumpGenerator generator(config, AudioProcessing::Config());
+ DebugDumpGenerator generator(config);
generator.StartRecording();
generator.Process(100);
generator.StopRecording();
« no previous file with comments | « webrtc/modules/audio_processing/test/audio_processing_simulator.cc ('k') | webrtc/modules/audio_processing/test/process_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698