| Index: webrtc/modules/audio_processing/audio_processing_impl.cc
|
| diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc
|
| index 87b82a6a3509131adae9ed698cc0f896fd01d4c0..f5e1564e185f48de23b9dc1df31bd2a741d3b053 100644
|
| --- a/webrtc/modules/audio_processing/audio_processing_impl.cc
|
| +++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
|
| @@ -194,8 +194,7 @@ AudioProcessingImpl::AudioProcessingImpl(const Config& config,
|
| #endif
|
| beamformer_enabled_(config.Get<Beamforming>().enabled),
|
| beamformer_(beamformer),
|
| - array_geometry_(config.Get<Beamforming>().array_geometry),
|
| - supports_48kHz_(config.Get<AudioProcessing48kHzSupport>().enabled) {
|
| + array_geometry_(config.Get<Beamforming>().array_geometry) {
|
| echo_cancellation_ = new EchoCancellationImpl(this, crit_);
|
| component_list_.push_back(echo_cancellation_);
|
|
|
| @@ -350,7 +349,7 @@ int AudioProcessingImpl::InitializeLocked(int input_sample_rate_hz,
|
| // We process at the closest native rate >= min(input rate, output rate)...
|
| int min_proc_rate = std::min(fwd_in_format_.rate(), fwd_out_format_.rate());
|
| int fwd_proc_rate;
|
| - if (supports_48kHz_ && min_proc_rate > kSampleRate32kHz) {
|
| + if (min_proc_rate > kSampleRate32kHz) {
|
| fwd_proc_rate = kSampleRate48kHz;
|
| } else if (min_proc_rate > kSampleRate16kHz) {
|
| fwd_proc_rate = kSampleRate32kHz;
|
|
|