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 a33294534307e1e593c1c605029eeb885d58f853..39e21f3c274306e02ed8051a44235d10ab3b98b1 100644 |
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc |
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc |
@@ -176,10 +176,8 @@ struct AudioProcessingImpl::ApmPrivateSubmodules { |
}; |
const int AudioProcessing::kNativeSampleRatesHz[] = { |
- AudioProcessing::kSampleRate8kHz, |
- AudioProcessing::kSampleRate16kHz, |
- AudioProcessing::kSampleRate32kHz, |
- AudioProcessing::kSampleRate48kHz}; |
+ AudioProcessing::kSampleRate8kHz, AudioProcessing::kSampleRate16kHz, |
+ AudioProcessing::kSampleRate32kHz, AudioProcessing::kSampleRate48kHz}; |
const size_t AudioProcessing::kNumNativeSampleRates = |
arraysize(AudioProcessing::kNativeSampleRatesHz); |
const int AudioProcessing::kMaxNativeSampleRateHz = AudioProcessing:: |
@@ -297,17 +295,13 @@ int AudioProcessingImpl::Initialize(int input_sample_rate_hz, |
ChannelLayout output_layout, |
ChannelLayout reverse_layout) { |
const ProcessingConfig processing_config = { |
- {{input_sample_rate_hz, |
- ChannelsFromLayout(input_layout), |
+ {{input_sample_rate_hz, ChannelsFromLayout(input_layout), |
LayoutHasKeyboard(input_layout)}, |
- {output_sample_rate_hz, |
- ChannelsFromLayout(output_layout), |
+ {output_sample_rate_hz, ChannelsFromLayout(output_layout), |
LayoutHasKeyboard(output_layout)}, |
- {reverse_sample_rate_hz, |
- ChannelsFromLayout(reverse_layout), |
+ {reverse_sample_rate_hz, ChannelsFromLayout(reverse_layout), |
LayoutHasKeyboard(reverse_layout)}, |
- {reverse_sample_rate_hz, |
- ChannelsFromLayout(reverse_layout), |
+ {reverse_sample_rate_hz, ChannelsFromLayout(reverse_layout), |
LayoutHasKeyboard(reverse_layout)}}}; |
return Initialize(processing_config); |
@@ -919,6 +913,7 @@ int AudioProcessingImpl::AnalyzeReverseStream(AudioFrame* frame) { |
frame->sample_rate_hz_ != kSampleRate48kHz) { |
return kBadSampleRateError; |
} |
+ |
// This interface does not tolerate different forward and reverse rates. |
if (frame->sample_rate_hz_ != |
formats_.api_format.input_stream().sample_rate_hz()) { |