Adding APM configuration in AEC dump.

webrtc/modules/audio_processing/test/unpack.cc

 /*
  *  Copyright (c) 2011 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 65 matching lines @@
   int output_samples_per_channel = 0;
   int num_reverse_channels = 0;
   int num_input_channels = 0;
   int num_output_channels = 0;
   rtc::scoped_ptr<WavWriter> reverse_wav_file;
   rtc::scoped_ptr<WavWriter> input_wav_file;
   rtc::scoped_ptr<WavWriter> output_wav_file;
   rtc::scoped_ptr<RawFile> reverse_raw_file;
   rtc::scoped_ptr<RawFile> input_raw_file;
   rtc::scoped_ptr<RawFile> output_raw_file;
+
+  FILE* settings_file = OpenFile(FLAGS_settings_file, "wb");
+
   while (ReadMessageFromFile(debug_file, &event_msg)) {
     if (event_msg.type() == Event::REVERSE_STREAM) {
       if (!event_msg.has_reverse_stream()) {
         printf("Corrupt input file: ReverseStream missing.\n");
         return 1;
       }
 
       const ReverseStream msg = event_msg.reverse_stream();
       if (msg.has_data()) {
         if (FLAGS_raw && !reverse_raw_file) {
@@ skipping 114 matching lines @@
           static FILE* keypress_file = OpenFile(FLAGS_keypress_file, "wb");
           bool keypress = msg.keypress();
           if (FLAGS_text) {
             fprintf(keypress_file, "%d\n", keypress);
           } else {
             WriteData(&keypress, sizeof(keypress), keypress_file,
                       FLAGS_keypress_file);
           }
         }
       }
+    } else if (event_msg.type() == Event::CONFIG) {
+      if (!event_msg.has_config()) {
+        printf("Corrupt input file: Config missing.\n");
+        return 1;
+      }
+      const audioproc::Config msg = event_msg.config();
+
+      fprintf(settings_file, "APM re-config at frame: %d\n", frame_count);
+      if (msg.has_aec_enabled()) {

[Andrew MacDonald, 2015/09/26 02:36:20]

Might be cooler to use a macro for this:

#define PRINT_CONFIG(field_name) \
  if (msg.has_##field_name()) { \
    fprintf(settings_file, #field_name ": %d\n", msg.field_name()); \
  }

...

PRINT_CONFIG(aec_enabled)
PRINT_CONFIG(aec_delay_agnostic)
...

Looks like the full protobuf Message class can provide descriptors that would
let us do this with complete agnosticism to the fields, but alas we only have
MessageLite.

[minyue-webrtc, 2015/09/26 16:26:44]

yes I like a macro, much easier to read and maintain.

+        fprintf(settings_file, "  AEC enabled: %d\n", msg.aec_enabled());
+      }
+      if (msg.has_aec_delay_agnostic()) {
+        fprintf(settings_file, "  AEC delay agnostic: %d\n",
+                msg.aec_delay_agnostic());
+      }
+      if (msg.has_aec_drift_compensation()) {
+        fprintf(settings_file, "  AEC drift compensation: %d\n",
+                msg.aec_drift_compensation());
+      }
+      if (msg.has_aec_extended_filter()) {
+      fprintf(settings_file, "  AEC extended filter: %d\n",
+              msg.aec_extended_filter());
+      }
+      if (msg.has_aec_suppression_level()) {
+        fprintf(settings_file, "  AEC suppression level: %d\n",
+              msg.aec_suppression_level());
+      }
+      if (msg.has_aecm_enabled()) {
+        fprintf(settings_file, "  AECM enabled: %d\n", msg.aecm_enabled());
+      }
+      if (msg.has_aecm_comfort_noise()) {
+        fprintf(settings_file, "  AECM comfort noise: %d\n",
+                msg.aecm_comfort_noise());
+      }
+      if (msg.has_aecm_routing_mode()) {
+        fprintf(settings_file, "  AECM routing mode: %d\n",
+                msg.aecm_routing_mode());
+      }
+      if (msg.has_agc_enabled()) {
+        fprintf(settings_file, "  AGC enabled: %d\n", msg.agc_enabled());
+      }
+      if (msg.has_agc_experiment()) {
+        fprintf(settings_file, "  AGC experiment: %d\n", msg.agc_experiment());
+      }
+      if (msg.has_agc_mode()) {
+        fprintf(settings_file, "  AGC mode: %d\n", msg.agc_mode());
+      }
+      if (msg.has_agc_limiter()) {
+        fprintf(settings_file, "  AGC limiter: %d\n", msg.agc_limiter());
+      }
+      if (msg.has_hpf_enabled()) {
+        fprintf(settings_file, "  HPF enabled: %d\n", msg.hpf_enabled());
+      }
+      if (msg.has_ns_enabled()) {
+        fprintf(settings_file, "  NS enabled: %d\n", msg.ns_enabled());
+      }
+      if (msg.has_ns_experiment()) {
+        fprintf(settings_file, "  NS experiment: %d\n", msg.ns_experiment());
+      }
+      if (msg.has_ns_level()) {
+        fprintf(settings_file, "  NS level: %d\n", msg. ns_level());
+      }
     } else if (event_msg.type() == Event::INIT) {
       if (!event_msg.has_init()) {
         printf("Corrupt input file: Init missing.\n");
         return 1;
       }
 
-      static FILE* settings_file = OpenFile(FLAGS_settings_file, "wb");
       const Init msg = event_msg.init();
       // These should print out zeros if they're missing.
       fprintf(settings_file, "Init at frame: %d\n", frame_count);
       int input_sample_rate = msg.sample_rate();
       fprintf(settings_file, "  Input sample rate: %d\n", input_sample_rate);
       int output_sample_rate = msg.output_sample_rate();
       fprintf(settings_file, "  Output sample rate: %d\n", output_sample_rate);
       int reverse_sample_rate = msg.reverse_sample_rate();
       fprintf(settings_file,
               "  Reverse sample rate: %d\n",
@@ skipping 35 matching lines @@
   }
 
   return 0;
 }
 
 }  // namespace webrtc
 
 int main(int argc, char* argv[]) {
   return webrtc::do_main(argc, argv);
 }