Index: webrtc/modules/audio_processing/test/audioproc_float.cc |
diff --git a/webrtc/modules/audio_processing/test/audioproc_float.cc b/webrtc/modules/audio_processing/test/audioproc_float.cc |
index d0c813f151e827d7760334ccf0c8f420b318a5a9..3c8b4041b4fe1d7818ea068c6c66f99e00430088 100644 |
--- a/webrtc/modules/audio_processing/test/audioproc_float.cc |
+++ b/webrtc/modules/audio_processing/test/audioproc_float.cc |
@@ -149,6 +149,7 @@ DEFINE_int(agc_limiter, |
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)"); |
@@ -188,6 +189,12 @@ void SetSettingIfSpecified(int value, rtc::Optional<int>* parameter) { |
} |
} |
+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
AleBzk
2017/09/29 09:39:06
Right. I removed this function, since it was only
|
+ *parameter = rtc::Optional<double>(value); |
+ } |
+} |
+ |
void SetSettingIfFlagSet(int32_t flag, rtc::Optional<bool>* parameter) { |
if (flag == 0) { |
*parameter = rtc::Optional<bool>(false); |
@@ -207,6 +214,7 @@ SimulationSettings CreateSettings() { |
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); |
@@ -262,6 +270,7 @@ SimulationSettings CreateSettings() { |
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); |
@@ -365,6 +374,10 @@ void PerformBasicParameterSanityChecks(const SimulationSettings& settings) { |
(*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), |