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

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

Issue 1422013002: Preparational work for an upcoming addition of a threadchecking scheme for APM (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@bundling_of_state_CL
Patch Set: Created 5 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
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
11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_
12 #define WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_ 12 #define WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_
13 13
14 #include <list> 14 #include <list>
15 #include <string> 15 #include <string>
16 #include <vector> 16 #include <vector>
17 17
18 #include "webrtc/base/scoped_ptr.h" 18 #include "webrtc/base/scoped_ptr.h"
19 #include "webrtc/base/thread_annotations.h" 19 #include "webrtc/base/thread_annotations.h"
20 #include "webrtc/base/thread_checker.h"
20 #include "webrtc/modules/audio_processing/include/audio_processing.h" 21 #include "webrtc/modules/audio_processing/include/audio_processing.h"
21 22
22 namespace webrtc { 23 namespace webrtc {
23 24
24 class AgcManagerDirect; 25 class AgcManagerDirect;
25 class AudioBuffer; 26 class AudioBuffer;
26 class AudioConverter; 27 class AudioConverter;
27 28
28 template<typename T> 29 template<typename T>
29 class Beamformer; 30 class Beamformer;
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 EchoControlMobileImpl* echo_control_mobile_; 148 EchoControlMobileImpl* echo_control_mobile_;
148 GainControlImpl* gain_control_; 149 GainControlImpl* gain_control_;
149 HighPassFilterImpl* high_pass_filter_; 150 HighPassFilterImpl* high_pass_filter_;
150 LevelEstimatorImpl* level_estimator_; 151 LevelEstimatorImpl* level_estimator_;
151 NoiseSuppressionImpl* noise_suppression_; 152 NoiseSuppressionImpl* noise_suppression_;
152 VoiceDetectionImpl* voice_detection_; 153 VoiceDetectionImpl* voice_detection_;
153 rtc::scoped_ptr<GainControlForNewAgc> gain_control_for_new_agc_; 154 rtc::scoped_ptr<GainControlForNewAgc> gain_control_for_new_agc_;
154 155
155 std::list<ProcessingComponent*> component_list_; 156 std::list<ProcessingComponent*> component_list_;
156 CriticalSectionWrapper* crit_; 157 CriticalSectionWrapper* crit_;
158 rtc::ThreadChecker render_thread_;
159 rtc::ThreadChecker capture_thread_;
kwiberg-webrtc 2015/10/26 13:57:56 *_thread_checker_ ?
peah-webrtc 2015/11/05 11:47:33 Done.
157 rtc::scoped_ptr<AudioBuffer> render_audio_; 160 rtc::scoped_ptr<AudioBuffer> render_audio_;
158 rtc::scoped_ptr<AudioBuffer> capture_audio_; 161 rtc::scoped_ptr<AudioBuffer> capture_audio_;
159 rtc::scoped_ptr<AudioConverter> render_converter_; 162 rtc::scoped_ptr<AudioConverter> render_converter_;
160 #ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP 163 #ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP
161 // TODO(andrew): make this more graceful. Ideally we would split this stuff 164 // TODO(andrew): make this more graceful. Ideally we would split this stuff
162 // out into a separate class with an "enabled" and "disabled" implementation. 165 // out into a separate class with an "enabled" and "disabled" implementation.
163 int WriteMessageToDebugFile(); 166 int WriteMessageToDebugFile();
164 int WriteInitMessage(); 167 int WriteInitMessage();
165 168
166 // Writes Config message. If not |forced|, only writes the current config if 169 // Writes Config message. If not |forced|, only writes the current config if
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 rtc::scoped_ptr<Beamformer<float>> beamformer_; 221 rtc::scoped_ptr<Beamformer<float>> beamformer_;
219 const std::vector<Point> array_geometry_; 222 const std::vector<Point> array_geometry_;
220 223
221 bool intelligibility_enabled_; 224 bool intelligibility_enabled_;
222 rtc::scoped_ptr<IntelligibilityEnhancer> intelligibility_enhancer_; 225 rtc::scoped_ptr<IntelligibilityEnhancer> intelligibility_enhancer_;
223 }; 226 };
224 227
225 } // namespace webrtc 228 } // namespace webrtc
226 229
227 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_ 230 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698