zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AGC2: Remove unused parameters

Browse Source 
- `NoiseEstimator` and `LevelEstimator` enums
- `vad_probability_attack`
- `level_estimator_adjacent_speech_frames_threshold`
- `use_saturation_protector`
- `gain_applier_adjacent_speech_frames_threshold`
- `initial_saturation_margin_db`
- `extra_saturation_margin_db`

Bug: webrtc:7494
Change-Id: I12e40c8efe2d2126d7597ec18a78cf9d5d39baf2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/232903
Reviewed-by: Sam Zackrisson <saza@webrtc.org>
Reviewed-by: Jesus de Vicente Pena <devicentepena@webrtc.org>
Commit-Queue: Alessio Bazzica <alessiob@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35096}
This commit is contained in:
Alessio Bazzica
2021-09-24 14:59:30 +02:00
committed by WebRTC LUCI CQ
parent f75f9c2b29
commit 1ac4f2a29e
10 changed files with 7 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/audio_processing/test/audio_processing_simulator.cc
View File

@ -487,8 +487,6 @@ void AudioProcessingSimulator::ConfigureAudioProcessor() {
if (settings_.agc2_use_adaptive_gain) {
apm_config.gain_controller2.adaptive_digital.enabled =
*settings_.agc2_use_adaptive_gain;
apm_config.gain_controller2.adaptive_digital.level_estimator =
settings_.agc2_adaptive_level_estimator;
}
}
if (settings_.use_pre_amplifier) {

2
modules/audio_processing/test/audio_processing_simulator.h
View File

@ -115,8 +115,6 @@ struct SimulationSettings {
absl::optional<int> agc_compression_gain;
absl::optional<bool> agc2_use_adaptive_gain;
absl::optional<float> agc2_fixed_gain_db;
AudioProcessing::Config::GainController2::LevelEstimator
agc2_adaptive_level_estimator;
absl::optional<float> pre_amplifier_gain_factor;
absl::optional<float> pre_gain_factor;
absl::optional<float> post_gain_factor;

31
modules/audio_processing/test/audioproc_float_impl.cc
View File

@ -159,10 +159,6 @@ ABSL_FLAG(float,
agc2_fixed_gain_db,
kParameterNotSpecifiedValue,
"AGC2 fixed gain (dB) to apply");
ABSL_FLAG(std::string,
agc2_adaptive_level_estimator,
"RMS",
"AGC2 adaptive digital level estimator to use [RMS, peak]");
ABSL_FLAG(float,
pre_amplifier_gain_factor,
kParameterNotSpecifiedValue,
@ -341,10 +337,6 @@ const char kUsageDescription[] =
"processing module, either based on wav files or "
"protobuf debug dump recordings.\n";
std::vector<std::string> GetAgc2AdaptiveLevelEstimatorNames() {
return {"RMS", "peak"};
}
void SetSettingIfSpecified(const std::string& value,
absl::optional<std::string>* parameter) {
if (value.compare("") != 0) {
@ -374,27 +366,6 @@ void SetSettingIfFlagSet(int32_t flag, absl::optional<bool>* parameter) {
}
}
AudioProcessing::Config::GainController2::LevelEstimator
MapAgc2AdaptiveLevelEstimator(absl::string_view name) {
if (name.compare("RMS") == 0) {
return AudioProcessing::Config::GainController2::LevelEstimator::kRms;
}
if (name.compare("peak") == 0) {
return AudioProcessing::Config::GainController2::LevelEstimator::kPeak;
}
auto concat_strings =
[](const std::vector<std::string>& strings) -> std::string {
rtc::StringBuilder ss;
for (const auto& s : strings) {
ss << " " << s;
}
return ss.Release();
};
RTC_CHECK(false)
<< "Invalid value for agc2_adaptive_level_estimator, valid options:"
<< concat_strings(GetAgc2AdaptiveLevelEstimatorNames()) << ".";
}
SimulationSettings CreateSettings() {
SimulationSettings settings;
if (absl::GetFlag(FLAGS_all_default)) {
@ -467,8 +438,6 @@ SimulationSettings CreateSettings() {
SetSettingIfSpecified(absl::GetFlag(FLAGS_agc2_fixed_gain_db),
&settings.agc2_fixed_gain_db);
settings.agc2_adaptive_level_estimator = MapAgc2AdaptiveLevelEstimator(
absl::GetFlag(FLAGS_agc2_adaptive_level_estimator));
SetSettingIfSpecified(absl::GetFlag(FLAGS_pre_amplifier_gain_factor),
&settings.pre_amplifier_gain_factor);
SetSettingIfSpecified(absl::GetFlag(FLAGS_pre_gain_factor),