Adding DebugDumpReplayer.

webrtc/modules/audio_processing/test/debug_dump_test.cc

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 6ca82a4d4376f6578d2c115a95592f14ba2f6135..06ec63bcdb39e9b99f289b307f94d8ee01fd83e8 100644
--- a/webrtc/modules/audio_processing/test/debug_dump_test.cc
+++ b/webrtc/modules/audio_processing/test/debug_dump_test.cc
@@ -10,20 +10,16 @@
 
 #include <stddef.h>  // size_t
 
-#include <memory>
 #include <string>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/common_audio/channel_buffer.h"
 #include "webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h"
-#include "webrtc/modules/audio_processing/debug.pb.h"
-#include "webrtc/modules/audio_processing/include/audio_processing.h"
-#include "webrtc/modules/audio_processing/test/protobuf_utils.h"
+#include "webrtc/modules/audio_processing/test/debug_dump_replayer.h"
 #include "webrtc/modules/audio_processing/test/test_utils.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
+
 namespace webrtc {
 namespace test {
 
@@ -233,240 +229,37 @@ void DebugDumpGenerator::ReadAndDeinterleave(ResampleInputAudioFile* audio,
 
 class DebugDumpTest : public ::testing::Test {
  public:
-  DebugDumpTest();
-
   // VerifyDebugDump replays a debug dump using APM and verifies that the result
   // is bit-exact-identical to the output channel in the dump. This is only
   // guaranteed if the debug dump is started on the first frame.
   void VerifyDebugDump(const std::string& dump_file_name);
 
  private:
-  // Following functions are facilities for replaying debug dumps.
-  void OnInitEvent(const audioproc::Init& msg);
-  void OnStreamEvent(const audioproc::Stream& msg);
-  void OnReverseStreamEvent(const audioproc::ReverseStream& msg);
-  void OnConfigEvent(const audioproc::Config& msg);
-
-  void MaybeRecreateApm(const audioproc::Config& msg);
-  void ConfigureApm(const audioproc::Config& msg);
-
-  // Buffer for APM input/output.
-  std::unique_ptr<ChannelBuffer<float>> input_;
-  std::unique_ptr<ChannelBuffer<float>> reverse_;
-  std::unique_ptr<ChannelBuffer<float>> output_;
-
-  std::unique_ptr<AudioProcessing> apm_;
-
-  StreamConfig input_config_;
-  StreamConfig reverse_config_;
-  StreamConfig output_config_;
+  DebugDumpReplayer debug_dump_replayer_;
 };
 
-DebugDumpTest::DebugDumpTest()
-    : input_(nullptr),  // will be created upon usage.
-      reverse_(nullptr),
-      output_(nullptr),
-      apm_(nullptr) {
-}
-
 void DebugDumpTest::VerifyDebugDump(const std::string& in_filename) {
-  FILE* in_file = fopen(in_filename.c_str(), "rb");
-  ASSERT_TRUE(in_file);
-  audioproc::Event event_msg;
-
-  while (ReadMessageFromFile(in_file, &event_msg)) {
-    switch (event_msg.type()) {
-      case audioproc::Event::INIT:
-        OnInitEvent(event_msg.init());
-        break;
-      case audioproc::Event::STREAM:
-        OnStreamEvent(event_msg.stream());
-        break;
-      case audioproc::Event::REVERSE_STREAM:
-        OnReverseStreamEvent(event_msg.reverse_stream());
-        break;
-      case audioproc::Event::CONFIG:
-        OnConfigEvent(event_msg.config());
-        break;
-      case audioproc::Event::UNKNOWN_EVENT:
-        // We do not expect receive UNKNOWN event currently.
-        FAIL();
+  ASSERT_TRUE(debug_dump_replayer_.SetDumpFile(in_filename));
+
+  if (const rtc::Optional<audioproc::Event> event =
+      debug_dump_replayer_.GetNextEvent()) {
+    debug_dump_replayer_.RunNextEvent();
+    if (event->type() == audioproc::Event::STREAM) {
+      const audioproc::Stream* msg = &event->stream();
+      const StreamConfig output_config = debug_dump_replayer_.GetOutputConfig();
+      const ChannelBuffer<float>* output = debug_dump_replayer_.GetOutput();
+      // Check that output of APM is bit-exact to the output in the dump.
+      ASSERT_EQ(output_config.num_channels(),
+                static_cast<size_t>(msg->output_channel_size()));
+      ASSERT_EQ(output_config.num_frames() * sizeof(float),
+                msg->output_channel(0).size());
+      for (int i = 0; i < msg->output_channel_size(); ++i) {
+        ASSERT_EQ(0, memcmp(output->channels()[i],
+                            msg->output_channel(i).data(),
+                            msg->output_channel(i).size()));
+      }
     }
   }
-  fclose(in_file);
-}
-
-// OnInitEvent reset the input/output/reserve channel format.
-void DebugDumpTest::OnInitEvent(const audioproc::Init& msg) {
-  ASSERT_TRUE(msg.has_num_input_channels());
-  ASSERT_TRUE(msg.has_output_sample_rate());
-  ASSERT_TRUE(msg.has_num_output_channels());
-  ASSERT_TRUE(msg.has_reverse_sample_rate());
-  ASSERT_TRUE(msg.has_num_reverse_channels());
-
-  input_config_ = StreamConfig(msg.sample_rate(), msg.num_input_channels());
-  output_config_ =
-      StreamConfig(msg.output_sample_rate(), msg.num_output_channels());
-  reverse_config_ =
-      StreamConfig(msg.reverse_sample_rate(), msg.num_reverse_channels());
-
-  MaybeResetBuffer(&input_, input_config_);
-  MaybeResetBuffer(&output_, output_config_);
-  MaybeResetBuffer(&reverse_, reverse_config_);
-}
-
-// OnStreamEvent replays an input signal and verifies the output.
-void DebugDumpTest::OnStreamEvent(const audioproc::Stream& msg) {
-  // APM should have been created.
-  ASSERT_TRUE(apm_.get());
-
-  EXPECT_NOERR(apm_->gain_control()->set_stream_analog_level(msg.level()));
-  EXPECT_NOERR(apm_->set_stream_delay_ms(msg.delay()));
-  apm_->echo_cancellation()->set_stream_drift_samples(msg.drift());
-  if (msg.has_keypress())
-    apm_->set_stream_key_pressed(msg.keypress());
-  else
-    apm_->set_stream_key_pressed(true);
-
-  ASSERT_EQ(input_config_.num_channels(),
-            static_cast<size_t>(msg.input_channel_size()));
-  ASSERT_EQ(input_config_.num_frames() * sizeof(float),
-            msg.input_channel(0).size());
-
-  for (int i = 0; i < msg.input_channel_size(); ++i) {
-     memcpy(input_->channels()[i], msg.input_channel(i).data(),
-            msg.input_channel(i).size());
-  }
-
-  ASSERT_EQ(AudioProcessing::kNoError,
-            apm_->ProcessStream(input_->channels(), input_config_,
-                                output_config_, output_->channels()));
-
-  // Check that output of APM is bit-exact to the output in the dump.
-  ASSERT_EQ(output_config_.num_channels(),
-            static_cast<size_t>(msg.output_channel_size()));
-  ASSERT_EQ(output_config_.num_frames() * sizeof(float),
-            msg.output_channel(0).size());
-  for (int i = 0; i < msg.output_channel_size(); ++i) {
-    ASSERT_EQ(0, memcmp(output_->channels()[i], msg.output_channel(i).data(),
-                        msg.output_channel(i).size()));
-  }
-}
-
-void DebugDumpTest::OnReverseStreamEvent(const audioproc::ReverseStream& msg) {
-  // APM should have been created.
-  ASSERT_TRUE(apm_.get());
-
-  ASSERT_GT(msg.channel_size(), 0);
-  ASSERT_EQ(reverse_config_.num_channels(),
-            static_cast<size_t>(msg.channel_size()));
-  ASSERT_EQ(reverse_config_.num_frames() * sizeof(float),
-            msg.channel(0).size());
-
-  for (int i = 0; i < msg.channel_size(); ++i) {
-     memcpy(reverse_->channels()[i], msg.channel(i).data(),
-            msg.channel(i).size());
-  }
-
-  ASSERT_EQ(AudioProcessing::kNoError,
-            apm_->ProcessReverseStream(reverse_->channels(),
-                                       reverse_config_,
-                                       reverse_config_,
-                                       reverse_->channels()));
-}
-
-void DebugDumpTest::OnConfigEvent(const audioproc::Config& msg) {
-  MaybeRecreateApm(msg);
-  ConfigureApm(msg);
-}
-
-void DebugDumpTest::MaybeRecreateApm(const audioproc::Config& msg) {
-  // These configurations cannot be changed on the fly.
-  Config config;
-  ASSERT_TRUE(msg.has_aec_delay_agnostic_enabled());
-  config.Set<DelayAgnostic>(
-      new DelayAgnostic(msg.aec_delay_agnostic_enabled()));
-
-  ASSERT_TRUE(msg.has_noise_robust_agc_enabled());
-  config.Set<ExperimentalAgc>(
-       new ExperimentalAgc(msg.noise_robust_agc_enabled()));
-
-  ASSERT_TRUE(msg.has_transient_suppression_enabled());
-  config.Set<ExperimentalNs>(
-      new ExperimentalNs(msg.transient_suppression_enabled()));
-
-  ASSERT_TRUE(msg.has_aec_extended_filter_enabled());
-  config.Set<ExtendedFilter>(new ExtendedFilter(
-      msg.aec_extended_filter_enabled()));
-
-  // We only create APM once, since changes on these fields should not
-  // happen in current implementation.
-  if (!apm_.get()) {
-    apm_.reset(AudioProcessing::Create(config));
-  }
-}
-
-void DebugDumpTest::ConfigureApm(const audioproc::Config& msg) {
-  // AEC configs.
-  ASSERT_TRUE(msg.has_aec_enabled());
-  EXPECT_EQ(AudioProcessing::kNoError,
-            apm_->echo_cancellation()->Enable(msg.aec_enabled()));
-
-  ASSERT_TRUE(msg.has_aec_drift_compensation_enabled());
-  EXPECT_EQ(AudioProcessing::kNoError,
-            apm_->echo_cancellation()->enable_drift_compensation(
-                msg.aec_drift_compensation_enabled()));
-
-  ASSERT_TRUE(msg.has_aec_suppression_level());
-  EXPECT_EQ(AudioProcessing::kNoError,
-            apm_->echo_cancellation()->set_suppression_level(
-                static_cast<EchoCancellation::SuppressionLevel>(
-                    msg.aec_suppression_level())));
-
-  // AECM configs.
-  ASSERT_TRUE(msg.has_aecm_enabled());
-  EXPECT_EQ(AudioProcessing::kNoError,
-            apm_->echo_control_mobile()->Enable(msg.aecm_enabled()));
-
-  ASSERT_TRUE(msg.has_aecm_comfort_noise_enabled());
-  EXPECT_EQ(AudioProcessing::kNoError,
-            apm_->echo_control_mobile()->enable_comfort_noise(
-                msg.aecm_comfort_noise_enabled()));
-
-  ASSERT_TRUE(msg.has_aecm_routing_mode());
-  EXPECT_EQ(AudioProcessing::kNoError,
-            apm_->echo_control_mobile()->set_routing_mode(
-                static_cast<EchoControlMobile::RoutingMode>(
-                    msg.aecm_routing_mode())));
-
-  // AGC configs.
-  ASSERT_TRUE(msg.has_agc_enabled());
-  EXPECT_EQ(AudioProcessing::kNoError,
-            apm_->gain_control()->Enable(msg.agc_enabled()));
-
-  ASSERT_TRUE(msg.has_agc_mode());
-  EXPECT_EQ(AudioProcessing::kNoError,
-            apm_->gain_control()->set_mode(
-                static_cast<GainControl::Mode>(msg.agc_mode())));
-
-  ASSERT_TRUE(msg.has_agc_limiter_enabled());
-  EXPECT_EQ(AudioProcessing::kNoError,
-            apm_->gain_control()->enable_limiter(msg.agc_limiter_enabled()));
-
-  // HPF configs.
-  ASSERT_TRUE(msg.has_hpf_enabled());
-  EXPECT_EQ(AudioProcessing::kNoError,
-            apm_->high_pass_filter()->Enable(msg.hpf_enabled()));
-
-  // NS configs.
-  ASSERT_TRUE(msg.has_ns_enabled());
-  EXPECT_EQ(AudioProcessing::kNoError,
-            apm_->noise_suppression()->Enable(msg.ns_enabled()));
-
-  ASSERT_TRUE(msg.has_ns_level());
-  EXPECT_EQ(AudioProcessing::kNoError,
-            apm_->noise_suppression()->set_level(
-                static_cast<NoiseSuppression::Level>(msg.ns_level())));
 }
 
 TEST_F(DebugDumpTest, SimpleCase) {