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

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

Issue 1764293002: Revert of Removed the inheritance from ProcessingComponent for EchoCancellerImpl. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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 | webrtc/modules/audio_processing/audio_processing_impl.cc » ('j') | 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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 void InitializeIntelligibility() 189 void InitializeIntelligibility()
190 EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_); 190 EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_);
191 void InitializeHighPassFilter() 191 void InitializeHighPassFilter()
192 EXCLUSIVE_LOCKS_REQUIRED(crit_capture_); 192 EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
193 void InitializeNoiseSuppression() 193 void InitializeNoiseSuppression()
194 EXCLUSIVE_LOCKS_REQUIRED(crit_capture_); 194 EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
195 void InitializeLevelEstimator() 195 void InitializeLevelEstimator()
196 EXCLUSIVE_LOCKS_REQUIRED(crit_capture_); 196 EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
197 void InitializeVoiceDetection() 197 void InitializeVoiceDetection()
198 EXCLUSIVE_LOCKS_REQUIRED(crit_capture_); 198 EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
199 void InitializeEchoCanceller()
200 EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_);
201 int InitializeLocked(const ProcessingConfig& config) 199 int InitializeLocked(const ProcessingConfig& config)
202 EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_); 200 EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_);
203 201
204 // Capture-side exclusive methods possibly running APM in a multi-threaded 202 // Capture-side exclusive methods possibly running APM in a multi-threaded
205 // manner that are called with the render lock already acquired. 203 // manner that are called with the render lock already acquired.
206 int ProcessStreamLocked() EXCLUSIVE_LOCKS_REQUIRED(crit_capture_); 204 int ProcessStreamLocked() EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
207 bool output_copy_needed(bool is_data_processed) const 205 bool output_copy_needed(bool is_data_processed) const
208 EXCLUSIVE_LOCKS_REQUIRED(crit_capture_); 206 EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
209 bool is_data_processed() const EXCLUSIVE_LOCKS_REQUIRED(crit_capture_); 207 bool is_data_processed() const EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
210 bool synthesis_needed(bool is_data_processed) const 208 bool synthesis_needed(bool is_data_processed) const
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 338
341 struct ApmRenderState { 339 struct ApmRenderState {
342 std::unique_ptr<AudioConverter> render_converter; 340 std::unique_ptr<AudioConverter> render_converter;
343 std::unique_ptr<AudioBuffer> render_audio; 341 std::unique_ptr<AudioBuffer> render_audio;
344 } render_ GUARDED_BY(crit_render_); 342 } render_ GUARDED_BY(crit_render_);
345 }; 343 };
346 344
347 } // namespace webrtc 345 } // namespace webrtc
348 346
349 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_ 347 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/audio_processing/audio_processing_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698