Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(181)

Unified Diff: webrtc/modules/audio_processing/audio_processing_impl.cc

Issue 1510493004: Bitexactness test for the highpass filter (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Sorted the files in the build file Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..e90d410181bd9f1e1ed2b8eec75e407d6c46a23f 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);
@@ -917,8 +911,20 @@ int AudioProcessingImpl::AnalyzeReverseStream(AudioFrame* frame) {
frame->sample_rate_hz_ != kSampleRate16kHz &&
frame->sample_rate_hz_ != kSampleRate32kHz &&
frame->sample_rate_hz_ != kSampleRate48kHz) {
+ LOG(LS_ERROR)
+ << "This interface only supports native sample rates (sample rate = "
+ << frame->sample_rate_hz_ << ")";
return kBadSampleRateError;
}
+
+ if (public_submodules_->echo_control_mobile->is_enabled() &&
the sun 2016/01/07 14:35:35 Why is this change in this CL?
peah-webrtc 2016/02/22 13:38:36 Oups! That was supposed to go with another CL. Rem
+ frame->sample_rate_hz_ > kMaxAECMSampleRateHz) {
+ LOG(LS_ERROR)
+ << "AECM only supports 16 or 8 kHz sample rates (sample rate = "
+ << frame->sample_rate_hz_ << ")";
+ return kUnsupportedComponentError;
+ }
+
// This interface does not tolerate different forward and reverse rates.
if (frame->sample_rate_hz_ !=
formats_.api_format.input_stream().sample_rate_hz()) {

Powered by Google App Engine
This is Rietveld 408576698