Revert of Introduced new scheme for controlling the functionality inside the audio processing module

webrtc/modules/audio_processing/test/debug_dump_test.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 30 matching lines @@
   DebugDumpGenerator(const std::string& input_file_name,
                      int input_file_rate_hz,
                      int input_channels,
                      const std::string& reverse_file_name,
                      int reverse_file_rate_hz,
                      int reverse_channels,
                      const Config& config,
                      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();
 
   // Changes the sample rate of the input audio to the APM.
   void SetInputRate(int rate_hz);
 
   // Sets if converts stereo input signal to mono by discarding other channels.
   void ForceInputMono(bool mono);
 
   // Changes the sample rate of the reverse audio to the APM.
@@ skipping 64 matching lines @@
       input_(new ChannelBuffer<float>(input_config_.num_frames(),
                                       input_config_.num_channels())),
       reverse_(new ChannelBuffer<float>(reverse_config_.num_frames(),
                                         reverse_config_.num_channels())),
       output_(new ChannelBuffer<float>(output_config_.num_frames(),
                                        output_config_.num_channels())),
       apm_(AudioProcessing::Create(config)),
       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() {
   remove(dump_file_name_.c_str());
 }
 
 void DebugDumpGenerator::SetInputRate(int rate_hz) {
   input_audio_.set_output_rate_hz(rate_hz);
   input_config_.set_sample_rate_hz(rate_hz);
   MaybeResetBuffer(&input_, input_config_);
@@ skipping 107 matching lines @@
         ASSERT_EQ(0, memcmp(output->channels()[i],
                             msg->output_channel(i).data(),
                             msg->output_channel(i).size()));
       }
     }
   }
 }
 
 TEST_F(DebugDumpTest, SimpleCase) {
   Config config;
-  DebugDumpGenerator generator(config, AudioProcessing::Config());
+  DebugDumpGenerator generator(config);
   generator.StartRecording();
   generator.Process(100);
   generator.StopRecording();
   VerifyDebugDump(generator.dump_file_name());
 }
 
 TEST_F(DebugDumpTest, ChangeInputFormat) {
   Config config;
-  DebugDumpGenerator generator(config, AudioProcessing::Config());
-
+  DebugDumpGenerator generator(config);
   generator.StartRecording();
   generator.Process(100);
   generator.SetInputRate(48000);
 
   generator.ForceInputMono(true);
   // Number of output channel should not be larger than that of input. APM will
   // fail otherwise.
   generator.SetOutputChannels(1);
 
   generator.Process(100);
   generator.StopRecording();
   VerifyDebugDump(generator.dump_file_name());
 }
 
 TEST_F(DebugDumpTest, ChangeReverseFormat) {
   Config config;
-  DebugDumpGenerator generator(config, AudioProcessing::Config());
+  DebugDumpGenerator generator(config);
   generator.StartRecording();
   generator.Process(100);
   generator.SetReverseRate(48000);
   generator.ForceReverseMono(true);
   generator.Process(100);
   generator.StopRecording();
   VerifyDebugDump(generator.dump_file_name());
 }
 
 TEST_F(DebugDumpTest, ChangeOutputFormat) {
   Config config;
-  DebugDumpGenerator generator(config, AudioProcessing::Config());
+  DebugDumpGenerator generator(config);
   generator.StartRecording();
   generator.Process(100);
   generator.SetOutputRate(48000);
   generator.SetOutputChannels(1);
   generator.Process(100);
   generator.StopRecording();
   VerifyDebugDump(generator.dump_file_name());
 }
 
 TEST_F(DebugDumpTest, ToggleAec) {
   Config config;
-  DebugDumpGenerator generator(config, AudioProcessing::Config());
+  DebugDumpGenerator generator(config);
   generator.StartRecording();
   generator.Process(100);
 
   EchoCancellation* aec = generator.apm()->echo_cancellation();
   EXPECT_EQ(AudioProcessing::kNoError, aec->Enable(!aec->is_enabled()));
 
   generator.Process(100);
   generator.StopRecording();
   VerifyDebugDump(generator.dump_file_name());
 }
 
 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);
 
   EchoCancellation* aec = generator.apm()->echo_cancellation();
   EXPECT_EQ(AudioProcessing::kNoError, aec->Enable(!aec->is_enabled()));
 
   generator.Process(100);
   generator.StopRecording();
   VerifyDebugDump(generator.dump_file_name());
 }
 
 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();
 
   DebugDumpReplayer debug_dump_replayer_;
 
   ASSERT_TRUE(debug_dump_replayer_.SetDumpFile(generator.dump_file_name()));
 
   while (const rtc::Optional<audioproc::Event> event =
              debug_dump_replayer_.GetNextEvent()) {
     debug_dump_replayer_.RunNextEvent();
     if (event->type() == audioproc::Event::CONFIG) {
       const audioproc::Config* msg = &event->config();
       ASSERT_TRUE(msg->has_experiments_description());
       EXPECT_PRED_FORMAT2(testing::IsSubstring, "RefinedAdaptiveFilter",
                           msg->experiments_description().c_str());
     }
   }
 }
 
 TEST_F(DebugDumpTest, VerifyCombinedExperimentalStringInclusive) {
   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();
 
   DebugDumpReplayer debug_dump_replayer_;
 
   ASSERT_TRUE(debug_dump_replayer_.SetDumpFile(generator.dump_file_name()));
 
   while (const rtc::Optional<audioproc::Event> event =
              debug_dump_replayer_.GetNextEvent()) {
     debug_dump_replayer_.RunNextEvent();
     if (event->type() == audioproc::Event::CONFIG) {
       const audioproc::Config* msg = &event->config();
       ASSERT_TRUE(msg->has_experiments_description());
       EXPECT_PRED_FORMAT2(testing::IsSubstring, "RefinedAdaptiveFilter",
                           msg->experiments_description().c_str());
       EXPECT_PRED_FORMAT2(testing::IsSubstring, "AEC3",
                           msg->experiments_description().c_str());
     }
   }
 }
 
 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();
 
   DebugDumpReplayer debug_dump_replayer_;
 
   ASSERT_TRUE(debug_dump_replayer_.SetDumpFile(generator.dump_file_name()));
 
   while (const rtc::Optional<audioproc::Event> event =
              debug_dump_replayer_.GetNextEvent()) {
     debug_dump_replayer_.RunNextEvent();
     if (event->type() == audioproc::Event::CONFIG) {
       const audioproc::Config* msg = &event->config();
       ASSERT_TRUE(msg->has_experiments_description());
       EXPECT_PRED_FORMAT2(testing::IsSubstring, "RefinedAdaptiveFilter",
                           msg->experiments_description().c_str());
       EXPECT_PRED_FORMAT2(testing::IsNotSubstring, "AEC3",
                           msg->experiments_description().c_str());
     }
   }
 }
 
 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();
 
   DebugDumpReplayer debug_dump_replayer_;
 
   ASSERT_TRUE(debug_dump_replayer_.SetDumpFile(generator.dump_file_name()));
 
   while (const rtc::Optional<audioproc::Event> event =
              debug_dump_replayer_.GetNextEvent()) {
     debug_dump_replayer_.RunNextEvent();
     if (event->type() == audioproc::Event::CONFIG) {
       const audioproc::Config* msg = &event->config();
       ASSERT_TRUE(msg->has_experiments_description());
       EXPECT_PRED_FORMAT2(testing::IsSubstring, "AEC3",
                           msg->experiments_description().c_str());
     }
   }
 }
 
 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();
 
   DebugDumpReplayer debug_dump_replayer_;
 
   ASSERT_TRUE(debug_dump_replayer_.SetDumpFile(generator.dump_file_name()));
 
   while (const rtc::Optional<audioproc::Event> event =
              debug_dump_replayer_.GetNextEvent()) {
     debug_dump_replayer_.RunNextEvent();
     if (event->type() == audioproc::Event::CONFIG) {
       const audioproc::Config* msg = &event->config();
       ASSERT_TRUE(msg->has_experiments_description());
       EXPECT_PRED_FORMAT2(testing::IsSubstring, "LevelController",
                           msg->experiments_description().c_str());
     }
   }
 }
 
 TEST_F(DebugDumpTest, VerifyEmptyExperimentalString) {
   Config config;
-  DebugDumpGenerator generator(config, AudioProcessing::Config());
+  DebugDumpGenerator generator(config);
   generator.StartRecording();
   generator.Process(100);
   generator.StopRecording();
 
   DebugDumpReplayer debug_dump_replayer_;
 
   ASSERT_TRUE(debug_dump_replayer_.SetDumpFile(generator.dump_file_name()));
 
   while (const rtc::Optional<audioproc::Event> event =
              debug_dump_replayer_.GetNextEvent()) {
     debug_dump_replayer_.RunNextEvent();
     if (event->type() == audioproc::Event::CONFIG) {
       const audioproc::Config* msg = &event->config();
       ASSERT_TRUE(msg->has_experiments_description());
       EXPECT_EQ(0u, msg->experiments_description().size());
     }
   }
 }
 
 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,
             aec->set_suppression_level(EchoCancellation::kLowSuppression));
   generator.StartRecording();
   generator.Process(100);
 
   EXPECT_EQ(AudioProcessing::kNoError,
             aec->set_suppression_level(EchoCancellation::kHighSuppression));
   generator.Process(100);
   generator.StopRecording();
   VerifyDebugDump(generator.dump_file_name());
 }
 
 #if defined(WEBRTC_ANDROID)
 // AGC may not be supported on Android.
 #define MAYBE_ToggleAgc DISABLED_ToggleAgc
 #else
 #define MAYBE_ToggleAgc ToggleAgc
 #endif
 TEST_F(DebugDumpTest, MAYBE_ToggleAgc) {
   Config config;
-  DebugDumpGenerator generator(config, AudioProcessing::Config());
+  DebugDumpGenerator generator(config);
   generator.StartRecording();
   generator.Process(100);
 
   GainControl* agc = generator.apm()->gain_control();
   EXPECT_EQ(AudioProcessing::kNoError, agc->Enable(!agc->is_enabled()));
 
   generator.Process(100);
   generator.StopRecording();
   VerifyDebugDump(generator.dump_file_name());
 }
 
 TEST_F(DebugDumpTest, ToggleNs) {
   Config config;
-  DebugDumpGenerator generator(config, AudioProcessing::Config());
+  DebugDumpGenerator generator(config);
   generator.StartRecording();
   generator.Process(100);
 
   NoiseSuppression* ns = generator.apm()->noise_suppression();
   EXPECT_EQ(AudioProcessing::kNoError, ns->Enable(!ns->is_enabled()));
 
   generator.Process(100);
   generator.StopRecording();
   VerifyDebugDump(generator.dump_file_name());
 }
 
 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();
   VerifyDebugDump(generator.dump_file_name());
 }
 
 }  // namespace test
 }  // namespace webrtc