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

Side by Side Diff: webrtc/modules/audio_processing/audio_processing_impl.cc

Issue 2481363008: Make sure that multiband processing is active when the residual echo detector is active. (Closed)
Patch Set: Created 4 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 182
183 changed |= first_update_; 183 changed |= first_update_;
184 first_update_ = false; 184 first_update_ = false;
185 return changed; 185 return changed;
186 } 186 }
187 187
188 bool AudioProcessingImpl::ApmSubmoduleStates::CaptureMultiBandSubModulesActive() 188 bool AudioProcessingImpl::ApmSubmoduleStates::CaptureMultiBandSubModulesActive()
189 const { 189 const {
190 #if WEBRTC_INTELLIGIBILITY_ENHANCER 190 #if WEBRTC_INTELLIGIBILITY_ENHANCER
191 return CaptureMultiBandProcessingActive() || 191 return CaptureMultiBandProcessingActive() ||
192 intelligibility_enhancer_enabled_ || voice_activity_detector_enabled_; 192 intelligibility_enhancer_enabled_ ||
193 voice_activity_detector_enabled_ || residual_echo_detector_enabled_;
193 #else 194 #else
194 return CaptureMultiBandProcessingActive() || voice_activity_detector_enabled_; 195 return CaptureMultiBandProcessingActive() ||
196 voice_activity_detector_enabled_ || residual_echo_detector_enabled_;
195 #endif 197 #endif
196 } 198 }
197 199
198 bool AudioProcessingImpl::ApmSubmoduleStates::CaptureMultiBandProcessingActive() 200 bool AudioProcessingImpl::ApmSubmoduleStates::CaptureMultiBandProcessingActive()
199 const { 201 const {
200 return high_pass_filter_enabled_ || echo_canceller_enabled_ || 202 return high_pass_filter_enabled_ || echo_canceller_enabled_ ||
201 mobile_echo_controller_enabled_ || noise_suppressor_enabled_ || 203 mobile_echo_controller_enabled_ || noise_suppressor_enabled_ ||
202 beamformer_enabled_ || adaptive_gain_controller_enabled_; 204 beamformer_enabled_ || adaptive_gain_controller_enabled_;
203 } 205 }
204 206
205 bool AudioProcessingImpl::ApmSubmoduleStates::RenderMultiBandSubModulesActive() 207 bool AudioProcessingImpl::ApmSubmoduleStates::RenderMultiBandSubModulesActive()
206 const { 208 const {
207 return RenderMultiBandProcessingActive() || echo_canceller_enabled_ || 209 return RenderMultiBandProcessingActive() || echo_canceller_enabled_ ||
208 mobile_echo_controller_enabled_ || adaptive_gain_controller_enabled_; 210 mobile_echo_controller_enabled_ || adaptive_gain_controller_enabled_ ||
211 residual_echo_detector_enabled_;
209 } 212 }
210 213
211 bool AudioProcessingImpl::ApmSubmoduleStates::RenderMultiBandProcessingActive() 214 bool AudioProcessingImpl::ApmSubmoduleStates::RenderMultiBandProcessingActive()
212 const { 215 const {
213 #if WEBRTC_INTELLIGIBILITY_ENHANCER 216 #if WEBRTC_INTELLIGIBILITY_ENHANCER
214 return intelligibility_enhancer_enabled_; 217 return intelligibility_enhancer_enabled_;
215 #else 218 #else
216 return false; 219 return false;
217 #endif 220 #endif
218 } 221 }
(...skipping 1604 matching lines...) Expand 10 before | Expand all | Expand 10 after
1823 capture_processing_format(kSampleRate16kHz), 1826 capture_processing_format(kSampleRate16kHz),
1824 split_rate(kSampleRate16kHz) {} 1827 split_rate(kSampleRate16kHz) {}
1825 1828
1826 AudioProcessingImpl::ApmCaptureState::~ApmCaptureState() = default; 1829 AudioProcessingImpl::ApmCaptureState::~ApmCaptureState() = default;
1827 1830
1828 AudioProcessingImpl::ApmRenderState::ApmRenderState() = default; 1831 AudioProcessingImpl::ApmRenderState::ApmRenderState() = default;
1829 1832
1830 AudioProcessingImpl::ApmRenderState::~ApmRenderState() = default; 1833 AudioProcessingImpl::ApmRenderState::~ApmRenderState() = default;
1831 1834
1832 } // namespace webrtc 1835 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698