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

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

Issue 2884913002: Ensures the residual echo detector does not requiring band-splitting (Closed)
Patch Set: Created 3 years, 7 months 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 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 213
214 changed |= first_update_; 214 changed |= first_update_;
215 first_update_ = false; 215 first_update_ = false;
216 return changed; 216 return changed;
217 } 217 }
218 218
219 bool AudioProcessingImpl::ApmSubmoduleStates::CaptureMultiBandSubModulesActive() 219 bool AudioProcessingImpl::ApmSubmoduleStates::CaptureMultiBandSubModulesActive()
220 const { 220 const {
221 #if WEBRTC_INTELLIGIBILITY_ENHANCER 221 #if WEBRTC_INTELLIGIBILITY_ENHANCER
222 return CaptureMultiBandProcessingActive() || 222 return CaptureMultiBandProcessingActive() ||
223 intelligibility_enhancer_enabled_ || 223 intelligibility_enhancer_enabled_ || voice_activity_detector_enabled_;
224 voice_activity_detector_enabled_ || residual_echo_detector_enabled_;
225 #else 224 #else
226 return CaptureMultiBandProcessingActive() || 225 return CaptureMultiBandProcessingActive() || voice_activity_detector_enabled_;
227 voice_activity_detector_enabled_ || residual_echo_detector_enabled_;
228 #endif 226 #endif
229 } 227 }
230 228
231 bool AudioProcessingImpl::ApmSubmoduleStates::CaptureMultiBandProcessingActive() 229 bool AudioProcessingImpl::ApmSubmoduleStates::CaptureMultiBandProcessingActive()
232 const { 230 const {
233 return low_cut_filter_enabled_ || echo_canceller_enabled_ || 231 return low_cut_filter_enabled_ || echo_canceller_enabled_ ||
234 mobile_echo_controller_enabled_ || noise_suppressor_enabled_ || 232 mobile_echo_controller_enabled_ || noise_suppressor_enabled_ ||
235 beamformer_enabled_ || adaptive_gain_controller_enabled_ || 233 beamformer_enabled_ || adaptive_gain_controller_enabled_ ||
236 echo_canceller3_enabled_; 234 echo_canceller3_enabled_;
237 } 235 }
238 236
239 bool AudioProcessingImpl::ApmSubmoduleStates::RenderMultiBandSubModulesActive() 237 bool AudioProcessingImpl::ApmSubmoduleStates::RenderMultiBandSubModulesActive()
240 const { 238 const {
241 return RenderMultiBandProcessingActive() || echo_canceller_enabled_ || 239 return RenderMultiBandProcessingActive() || echo_canceller_enabled_ ||
242 mobile_echo_controller_enabled_ || adaptive_gain_controller_enabled_ || 240 mobile_echo_controller_enabled_ || adaptive_gain_controller_enabled_ ||
243 residual_echo_detector_enabled_ || echo_canceller3_enabled_; 241 echo_canceller3_enabled_;
244 } 242 }
245 243
246 bool AudioProcessingImpl::ApmSubmoduleStates::RenderMultiBandProcessingActive() 244 bool AudioProcessingImpl::ApmSubmoduleStates::RenderMultiBandProcessingActive()
247 const { 245 const {
248 #if WEBRTC_INTELLIGIBILITY_ENHANCER 246 #if WEBRTC_INTELLIGIBILITY_ENHANCER
249 return intelligibility_enhancer_enabled_; 247 return intelligibility_enhancer_enabled_;
250 #else 248 #else
251 return false; 249 return false;
252 #endif 250 #endif
253 } 251 }
(...skipping 1760 matching lines...) Expand 10 before | Expand all | Expand 10 after
2014 previous_agc_level(0), 2012 previous_agc_level(0),
2015 echo_path_gain_change(false) {} 2013 echo_path_gain_change(false) {}
2016 2014
2017 AudioProcessingImpl::ApmCaptureState::~ApmCaptureState() = default; 2015 AudioProcessingImpl::ApmCaptureState::~ApmCaptureState() = default;
2018 2016
2019 AudioProcessingImpl::ApmRenderState::ApmRenderState() = default; 2017 AudioProcessingImpl::ApmRenderState::ApmRenderState() = default;
2020 2018
2021 AudioProcessingImpl::ApmRenderState::~ApmRenderState() = default; 2019 AudioProcessingImpl::ApmRenderState::~ApmRenderState() = default;
2022 2020
2023 } // namespace webrtc 2021 } // 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