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}
diff --git a/webrtc/modules/audio_processing/audio_processing_impl.h b/webrtc/modules/audio_processing/audio_processing_impl.h
index fa07281..f83f6ad 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.h
+++ b/webrtc/modules/audio_processing/audio_processing_impl.h
@@ -42,10 +42,9 @@
public:
// Methods forcing APM to run in a single-threaded manner.
// Acquires both the render and capture locks.
- explicit AudioProcessingImpl(const webrtc::Config& config);
+ explicit AudioProcessingImpl(const Config& config);
// AudioProcessingImpl takes ownership of beamformer.
- AudioProcessingImpl(const webrtc::Config& config,
- NonlinearBeamformer* beamformer);
+ AudioProcessingImpl(const Config& config, NonlinearBeamformer* beamformer);
~AudioProcessingImpl() override;
int Initialize() override;
int Initialize(int input_sample_rate_hz,
@@ -55,8 +54,7 @@
ChannelLayout output_layout,
ChannelLayout reverse_layout) override;
int Initialize(const ProcessingConfig& processing_config) override;
- void ApplyConfig(const AudioProcessing::Config& config) override;
- void SetExtraOptions(const webrtc::Config& config) override;
+ void SetExtraOptions(const Config& config) override;
void UpdateHistogramsOnCallEnd() override;
int StartDebugRecording(const char filename[kMaxFilenameSize],
int64_t max_log_size_bytes) override;
@@ -343,12 +341,14 @@
struct ApmCaptureNonLockedState {
ApmCaptureNonLockedState(bool beamformer_enabled,
- bool intelligibility_enabled)
+ bool intelligibility_enabled,
+ bool level_controller_enabled)
: fwd_proc_format(kSampleRate16kHz),
split_rate(kSampleRate16kHz),
stream_delay_ms(0),
beamformer_enabled(beamformer_enabled),
- intelligibility_enabled(intelligibility_enabled) {}
+ intelligibility_enabled(intelligibility_enabled),
+ level_controller_enabled(level_controller_enabled) {}
// Only the rate and samples fields of fwd_proc_format_ are used because the
// forward processing number of channels is mutable and is tracked by the
// capture_audio_.
@@ -357,7 +357,7 @@
int stream_delay_ms;
bool beamformer_enabled;
bool intelligibility_enabled;
- bool level_controller_enabled = false;
+ bool level_controller_enabled;
} capture_nonlocked_;
struct ApmRenderState {