commit b3b79b611597f44c1d2b29f2d833b6d5928d7a68
author aluebs <aluebs@webrtc.org> Mon Jul 27 10:17:58 2015 -0700
committer Commit bot <commit-bot@chromium.org> Mon Jul 27 17:18:05 2015 +0000
tree 2706825f6936339416f3e9b179ea4ff2a0377b1e
parent ef35f069e739feaae16fdfcc815d7af5cb05e9ae

Clean up the Config to enable 48kHz support in AudioProcessing

Now 48kHz is enabled by default.

BUG=webrtc:3146

Review URL: https://codereview.webrtc.org/1233393003

Cr-Commit-Position: refs/heads/master@{#9643}

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 3d62439..bbfb771 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -210,8 +210,7 @@
 #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_);
 
@@ -375,7 +374,7 @@
       std::min(api_format_.input_stream().sample_rate_hz(),
                api_format_.output_stream().sample_rate_hz());
   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;