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 267929a0dd96d33335496f42a934039ac3fc6ede..1623875ca6b9bf44273f66f02fc09ea160f64740 100644 |
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc |
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc |
@@ -117,7 +117,6 @@ const size_t AudioProcessing::kNumNativeSampleRates = |
arraysize(AudioProcessing::kNativeSampleRatesHz); |
const int AudioProcessing::kMaxNativeSampleRateHz = AudioProcessing:: |
kNativeSampleRatesHz[AudioProcessing::kNumNativeSampleRates - 1]; |
-const int AudioProcessing::kMaxAECMSampleRateHz = kSampleRate16kHz; |
AudioProcessing* AudioProcessing::Create() { |
Config config; |
@@ -347,7 +346,7 @@ int AudioProcessingImpl::InitializeLocked(const ProcessingConfig& config) { |
formats_.api_format = config; |
- // We process at the closest native rate >= min(input rate, output rate)... |
+ // We process at the closest native rate >= min(input rate, output rate). |
const int min_proc_rate = |
std::min(formats_.api_format.input_stream().sample_rate_hz(), |
formats_.api_format.output_stream().sample_rate_hz()); |
@@ -358,11 +357,6 @@ int AudioProcessingImpl::InitializeLocked(const ProcessingConfig& config) { |
break; |
} |
} |
- // ...with one exception. |
- if (public_submodules_->echo_control_mobile->is_enabled() && |
- min_proc_rate > kMaxAECMSampleRateHz) { |
- fwd_proc_rate = kMaxAECMSampleRateHz; |
- } |
capture_nonlocked_.fwd_proc_format = StreamConfig(fwd_proc_rate); |
@@ -595,12 +589,6 @@ int AudioProcessingImpl::ProcessStream(AudioFrame* frame) { |
return kBadSampleRateError; |
} |
- if (public_submodules_->echo_control_mobile->is_enabled() && |
- frame->sample_rate_hz_ > kMaxAECMSampleRateHz) { |
- LOG(LS_ERROR) << "AECM only supports 16 or 8 kHz sample rates"; |
- return kUnsupportedComponentError; |
- } |
- |
ProcessingConfig processing_config; |
{ |
// Aquire lock for the access of api_format. |
@@ -1254,7 +1242,9 @@ void AudioProcessingImpl::InitializeGainController() { |
void AudioProcessingImpl::InitializeEchoControlMobile() { |
public_submodules_->echo_control_mobile->Initialize( |
- proc_sample_rate_hz(), num_reverse_channels(), num_output_channels()); |
+ proc_split_sample_rate_hz(), |
+ num_reverse_channels(), |
+ num_output_channels()); |
} |
void AudioProcessingImpl::InitializeLevelEstimator() { |