mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-20 09:07:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hooked up the control of the adaptive AGC2 mode in audioproc_f

Browse source 
This CL adds the ability to toggle the AGC2 adaptive digital mode in
audioproc_f

Bug: webrtc:5298
Change-Id: If1567d8c87f88992dff89253edb293a56cee0a73
Reviewed-on: https://webrtc-review.googlesource.com/c/103361
Reviewed-by: Alex Loiko <aleloi@webrtc.org>
Commit-Queue: Per Åhgren <peah@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24954}
This commit is contained in:
Per Åhgren 2018-10-02 23:40:07 +02:00 committed by Commit Bot
parent 5c25010c86
commit e4d23b1adf
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/audio_processing/test/audio_processing_simulator.cc
View file

@ -918,6 +918,10 @@ void AudioProcessingSimulator::CreateAudioProcessor() {
if (settings_.use_agc2) { if (settings_.use_agc2) {
apm_config.gain_controller2.enabled = *settings_.use_agc2; apm_config.gain_controller2.enabled = *settings_.use_agc2;
apm_config.gain_controller2.fixed_gain_db = settings_.agc2_fixed_gain_db; apm_config.gain_controller2.fixed_gain_db = settings_.agc2_fixed_gain_db;
if (settings_.agc2_use_adaptive_gain) {
apm_config.gain_controller2.adaptive_digital_mode =
*settings_.agc2_use_adaptive_gain;
}
} }
if (settings_.use_pre_amplifier) { if (settings_.use_pre_amplifier) {
apm_config.pre_amplifier.enabled = *settings_.use_pre_amplifier; apm_config.pre_amplifier.enabled = *settings_.use_pre_amplifier;

1
modules/audio_processing/test/audio_processing_simulator.h
View file

@ -73,6 +73,7 @@ struct SimulationSettings {
absl::optional<int> agc_target_level; absl::optional<int> agc_target_level;
absl::optional<bool> use_agc_limiter; absl::optional<bool> use_agc_limiter;
absl::optional<int> agc_compression_gain; absl::optional<int> agc_compression_gain;
absl::optional<bool> agc2_use_adaptive_gain;
float agc2_fixed_gain_db; float agc2_fixed_gain_db;
float pre_amplifier_gain_factor; float pre_amplifier_gain_factor;
absl::optional<int> vad_likelihood; absl::optional<int> vad_likelihood;

5
modules/audio_processing/test/audioproc_float_impl.cc
View file

@ -139,6 +139,9 @@ DEFINE_int(agc_limiter,
DEFINE_int(agc_compression_gain, DEFINE_int(agc_compression_gain,
kParameterNotSpecifiedValue, kParameterNotSpecifiedValue,
"Specify the AGC compression gain (0-90)"); "Specify the AGC compression gain (0-90)");
DEFINE_float(agc2_enable_adaptive_gain,
kParameterNotSpecifiedValue,
"Activate (1) or deactivate(0) the AGC2 adaptive gain");
DEFINE_float(agc2_fixed_gain_db, 0.f, "AGC2 fixed gain (dB) to apply"); DEFINE_float(agc2_fixed_gain_db, 0.f, "AGC2 fixed gain (dB) to apply");
DEFINE_float(pre_amplifier_gain_factor, DEFINE_float(pre_amplifier_gain_factor,
1.f, 1.f,
@ -269,6 +272,8 @@ SimulationSettings CreateSettings() {
SetSettingIfFlagSet(FLAG_agc_limiter, &settings.use_agc_limiter); SetSettingIfFlagSet(FLAG_agc_limiter, &settings.use_agc_limiter);
SetSettingIfSpecified(FLAG_agc_compression_gain, SetSettingIfSpecified(FLAG_agc_compression_gain,
&settings.agc_compression_gain); &settings.agc_compression_gain);
SetSettingIfFlagSet(FLAG_agc2_enable_adaptive_gain,
&settings.agc2_use_adaptive_gain);
settings.agc2_fixed_gain_db = FLAG_agc2_fixed_gain_db; settings.agc2_fixed_gain_db = FLAG_agc2_fixed_gain_db;
settings.pre_amplifier_gain_factor = FLAG_pre_amplifier_gain_factor; settings.pre_amplifier_gain_factor = FLAG_pre_amplifier_gain_factor;
SetSettingIfSpecified(FLAG_vad_likelihood, &settings.vad_likelihood); SetSettingIfSpecified(FLAG_vad_likelihood, &settings.vad_likelihood);