Revert of Introduced new scheme for controlling the functionality inside the audio processing module (patchset #12 id:260001 of https://codereview.webrtc.org/2292863002/ )
Reason for revert: Interface change in the mock breaks downstream code. Original issue's description: > The current scheme for setting parameters and specifying the behavior > of the audio processing module is quite complex and hard to implement > in a threadsafe and efficient manner. Therefore a new scheme for setting > the parameters in the audio processing module is introduced in this CL. > > The idea is to roll this scheme out gradually and as a first functionality > in the audio processing module where this is applied the level controller > was chosen. This CL includes the replacement of the Config-based > level controller scheme with the new scheme. > > BUG=webrtc:5298 > > Committed: https://crrev.com/c8bbe3fe9aad9e9a1189a42dcaa8f5d6c261ecc8 > Cr-Commit-Position: refs/heads/master@{#14171} TBR=solenberg@webrtc.org,henrik.lundin@webrtc.org,peah@webrtc.org BUG=webrtc:5298 NOTRY=True Review-Url: https://codereview.webrtc.org/2334583002 Cr-Commit-Position: refs/heads/master@{#14177}
This commit is contained in:
@ -177,7 +177,6 @@ void void_main(int argc, char* argv[]) {
|
||||
int extra_delay_ms = 0;
|
||||
int override_delay_ms = 0;
|
||||
Config config;
|
||||
AudioProcessing::Config apm_config;
|
||||
|
||||
ASSERT_EQ(apm->kNoError, apm->level_estimator()->Enable(true));
|
||||
for (int i = 1; i < argc; i++) {
|
||||
@ -263,7 +262,8 @@ void void_main(int argc, char* argv[]) {
|
||||
suppression_level)));
|
||||
|
||||
} else if (strcmp(argv[i], "--level_control") == 0) {
|
||||
apm_config.level_controller.enabled = true;
|
||||
config.Set<LevelControl>(new LevelControl(true));
|
||||
|
||||
} else if (strcmp(argv[i], "--extended_filter") == 0) {
|
||||
config.Set<ExtendedFilter>(new ExtendedFilter(true));
|
||||
|
||||
@ -452,7 +452,6 @@ void void_main(int argc, char* argv[]) {
|
||||
FAIL() << "Unrecognized argument " << argv[i];
|
||||
}
|
||||
}
|
||||
apm->ApplyConfig(apm_config);
|
||||
apm->SetExtraOptions(config);
|
||||
|
||||
// If we're reading a protobuf file, ensure a simulation hasn't also
|
||||
|
||||
Reference in New Issue
Block a user