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

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

Issue 2884593002: Moving the residual echo detector outside of band-scheme in APM (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 | 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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_); 251 EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_);
252 void InitializeLevelController() EXCLUSIVE_LOCKS_REQUIRED(crit_capture_); 252 void InitializeLevelController() EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
253 void InitializeResidualEchoDetector() 253 void InitializeResidualEchoDetector()
254 EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_); 254 EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_);
255 void InitializeLowCutFilter() EXCLUSIVE_LOCKS_REQUIRED(crit_capture_); 255 void InitializeLowCutFilter() EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
256 void InitializeEchoCanceller3() EXCLUSIVE_LOCKS_REQUIRED(crit_capture_); 256 void InitializeEchoCanceller3() EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
257 257
258 void EmptyQueuedRenderAudio(); 258 void EmptyQueuedRenderAudio();
259 void AllocateRenderQueue() 259 void AllocateRenderQueue()
260 EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_); 260 EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_);
261 void QueueRenderAudio(AudioBuffer* audio) 261 void QueueBandedRenderAudio(AudioBuffer* audio)
262 EXCLUSIVE_LOCKS_REQUIRED(crit_render_);
263 void QueueNonbandedRenderAudio(AudioBuffer* audio)
262 EXCLUSIVE_LOCKS_REQUIRED(crit_render_); 264 EXCLUSIVE_LOCKS_REQUIRED(crit_render_);
263 265
264 // Capture-side exclusive methods possibly running APM in a multi-threaded 266 // Capture-side exclusive methods possibly running APM in a multi-threaded
265 // manner that are called with the render lock already acquired. 267 // manner that are called with the render lock already acquired.
266 int ProcessCaptureStreamLocked() EXCLUSIVE_LOCKS_REQUIRED(crit_capture_); 268 int ProcessCaptureStreamLocked() EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
267 void MaybeUpdateHistograms() EXCLUSIVE_LOCKS_REQUIRED(crit_capture_); 269 void MaybeUpdateHistograms() EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
268 270
269 // Render-side exclusive methods possibly running APM in a multi-threaded 271 // Render-side exclusive methods possibly running APM in a multi-threaded
270 // manner that are called with the render lock already acquired. 272 // manner that are called with the render lock already acquired.
271 // TODO(ekm): Remove once all clients updated to new interface. 273 // TODO(ekm): Remove once all clients updated to new interface.
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 std::unique_ptr< 432 std::unique_ptr<
431 SwapQueue<std::vector<int16_t>, RenderQueueItemVerifier<int16_t>>> 433 SwapQueue<std::vector<int16_t>, RenderQueueItemVerifier<int16_t>>>
432 agc_render_signal_queue_; 434 agc_render_signal_queue_;
433 std::unique_ptr<SwapQueue<std::vector<float>, RenderQueueItemVerifier<float>>> 435 std::unique_ptr<SwapQueue<std::vector<float>, RenderQueueItemVerifier<float>>>
434 red_render_signal_queue_; 436 red_render_signal_queue_;
435 }; 437 };
436 438
437 } // namespace webrtc 439 } // namespace webrtc
438 440
439 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_ 441 #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