AGC2 dummy module: fixed gain param, APM integration, audioproc_f adaptation

webrtc/modules/audio_processing/test/audioproc_float.cc

 /*
  *  Copyright (c) 2014 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 131 matching lines @@
            "Specify the AGC mode (0-2)");
 DEFINE_int(agc_target_level,
            kParameterNotSpecifiedValue,
            "Specify the AGC target level (0-31)");
 DEFINE_int(agc_limiter,
            kParameterNotSpecifiedValue,
            "Activate (1) or deactivate(0) the level estimator");
 DEFINE_int(agc_compression_gain,
            kParameterNotSpecifiedValue,
            "Specify the AGC compression gain (0-90)");
+DEFINE_float(agc2_fixed_gain_db, 0.0, "AGC2 fixed gain (dB) to apply");
 DEFINE_int(vad_likelihood,
            kParameterNotSpecifiedValue,
            "Specify the VAD likelihood (0-3)");
 DEFINE_int(ns_level,
            kParameterNotSpecifiedValue,
            "Specify the NS level (0-3)");
 DEFINE_int(stream_delay,
            kParameterNotSpecifiedValue,
            "Specify the stream delay in ms to use");
 DEFINE_int(stream_drift_samples,
@@ skipping 19 matching lines @@
     *parameter = rtc::Optional<std::string>(value);
   }
 }
 
 void SetSettingIfSpecified(int value, rtc::Optional<int>* parameter) {
   if (value != kParameterNotSpecifiedValue) {
     *parameter = rtc::Optional<int>(value);
   }
 }
 
+void SetSettingIfSpecified(double value, rtc::Optional<double>* parameter) {
+  if (value != kParameterNotSpecifiedValue) {

[peah-webrtc, 2017/09/15 07:44:25]

I'm not 100 % sure this comparison can be done for doubles. Have you checked
that it works?

[AleBzk, 2017/09/29 09:39:06]

Right. I removed this function, since it was only used for agc2_fixed_gain_db,
which is 0 by default. Plus, I made agc2_fixed_gain_db non optional and set to 0
by default.

+    *parameter = rtc::Optional<double>(value);
+  }
+}
+
 void SetSettingIfFlagSet(int32_t flag, rtc::Optional<bool>* parameter) {
   if (flag == 0) {
     *parameter = rtc::Optional<bool>(false);
   } else if (flag == 1) {
     *parameter = rtc::Optional<bool>(true);
   }
 }
 
 SimulationSettings CreateSettings() {
   SimulationSettings settings;
   if (FLAG_all_default) {
     settings.use_le = rtc::Optional<bool>(true);
     settings.use_vad = rtc::Optional<bool>(true);
     settings.use_ie = rtc::Optional<bool>(false);
     settings.use_bf = rtc::Optional<bool>(false);
     settings.use_ts = rtc::Optional<bool>(true);
     settings.use_ns = rtc::Optional<bool>(true);
     settings.use_hpf = rtc::Optional<bool>(true);
     settings.use_agc = rtc::Optional<bool>(true);
+    settings.use_agc2 = rtc::Optional<bool>(false);
     settings.use_aec = rtc::Optional<bool>(true);
     settings.use_aecm = rtc::Optional<bool>(false);
     settings.use_ed = rtc::Optional<bool>(false);
   }
   SetSettingIfSpecified(FLAG_dump_input, &settings.aec_dump_input_filename);
   SetSettingIfSpecified(FLAG_dump_output, &settings.aec_dump_output_filename);
   SetSettingIfSpecified(FLAG_i, &settings.input_filename);
   SetSettingIfSpecified(FLAG_o, &settings.output_filename);
   SetSettingIfSpecified(FLAG_ri, &settings.reverse_input_filename);
   SetSettingIfSpecified(FLAG_ro, &settings.reverse_output_filename);
@@ skipping 35 matching lines @@
   SetSettingIfFlagSet(FLAG_lc, &settings.use_lc);
   SetSettingIfFlagSet(FLAG_experimental_agc, &settings.use_experimental_agc);
   SetSettingIfSpecified(FLAG_aecm_routing_mode, &settings.aecm_routing_mode);
   SetSettingIfFlagSet(FLAG_aecm_comfort_noise,
                       &settings.use_aecm_comfort_noise);
   SetSettingIfSpecified(FLAG_agc_mode, &settings.agc_mode);
   SetSettingIfSpecified(FLAG_agc_target_level, &settings.agc_target_level);
   SetSettingIfFlagSet(FLAG_agc_limiter, &settings.use_agc_limiter);
   SetSettingIfSpecified(FLAG_agc_compression_gain,
                         &settings.agc_compression_gain);
+  SetSettingIfSpecified(FLAG_agc2_fixed_gain_db, &settings.agc2_fixed_gain_db);
   SetSettingIfSpecified(FLAG_vad_likelihood, &settings.vad_likelihood);
   SetSettingIfSpecified(FLAG_ns_level, &settings.ns_level);
   SetSettingIfSpecified(FLAG_stream_delay, &settings.stream_delay);
   SetSettingIfSpecified(FLAG_stream_drift_samples,
                         &settings.stream_drift_samples);
   SetSettingIfSpecified(FLAG_custom_call_order_file,
                         &settings.custom_call_order_filename);
   settings.report_performance = FLAG_performance_report;
   settings.use_verbose_logging = FLAG_verbose;
   settings.report_bitexactness = FLAG_bitexactness_report;
@@ skipping 84 matching lines @@
       settings.agc_target_level && ((*settings.agc_target_level) < 0 ||
                                     (*settings.agc_target_level) > 31),
       "Error: --agc_target_level must be specified between 0 and 31.\n");
 
   ReportConditionalErrorAndExit(
       settings.agc_compression_gain && ((*settings.agc_compression_gain) < 0 ||
                                         (*settings.agc_compression_gain) > 90),
       "Error: --agc_compression_gain must be specified between 0 and 90.\n");
 
   ReportConditionalErrorAndExit(
+      *settings.use_agc && *settings.use_agc2,
+      "Error: --agc and --agc2 cannot be both active.\n");
+
+  ReportConditionalErrorAndExit(
       settings.vad_likelihood &&
           ((*settings.vad_likelihood) < 0 || (*settings.vad_likelihood) > 3),
       "Error: --vad_likelihood must be specified between 0 and 3.\n");
 
   ReportConditionalErrorAndExit(
       settings.ns_level &&
           ((*settings.ns_level) < 0 || (*settings.ns_level) > 3),
       "Error: --ns_level must be specified between 0 and 3.\n");
 
   ReportConditionalErrorAndExit(
@@ skipping 91 matching lines @@
 
   return 0;
 }
 
 }  // namespace test
 }  // namespace webrtc
 
 int main(int argc, char* argv[]) {
   return webrtc::test::main(argc, argv);
 }