| OLD | NEW |
| 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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 std::list<ProcessingComponent*> component_list_; | 169 std::list<ProcessingComponent*> component_list_; |
| 170 CriticalSectionWrapper* crit_; | 170 CriticalSectionWrapper* crit_; |
| 171 rtc::scoped_ptr<AudioBuffer> render_audio_; | 171 rtc::scoped_ptr<AudioBuffer> render_audio_; |
| 172 rtc::scoped_ptr<AudioBuffer> capture_audio_; | 172 rtc::scoped_ptr<AudioBuffer> capture_audio_; |
| 173 rtc::scoped_ptr<AudioConverter> render_converter_; | 173 rtc::scoped_ptr<AudioConverter> render_converter_; |
| 174 #ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP | 174 #ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP |
| 175 // TODO(andrew): make this more graceful. Ideally we would split this stuff | 175 // TODO(andrew): make this more graceful. Ideally we would split this stuff |
| 176 // out into a separate class with an "enabled" and "disabled" implementation. | 176 // out into a separate class with an "enabled" and "disabled" implementation. |
| 177 int WriteMessageToDebugFile(); | 177 int WriteMessageToDebugFile(); |
| 178 int WriteInitMessage(); | 178 int WriteInitMessage(); |
| 179 int WriteConfigMessage(); | 179 int WriteConfigMessageIfChanged(); |
| 180 | |
| 181 // Updates |config_| and returns true if any change is made. | |
| 182 bool UpdateCurrentConfig(); | |
| 183 | 180 |
| 184 rtc::scoped_ptr<FileWrapper> debug_file_; | 181 rtc::scoped_ptr<FileWrapper> debug_file_; |
| 185 rtc::scoped_ptr<audioproc::Event> event_msg_; // Protobuf message. | 182 rtc::scoped_ptr<audioproc::Event> event_msg_; // Protobuf message. |
| 186 std::string event_str_; // Memory for protobuf serialization. | 183 std::string event_str_; // Memory for protobuf serialization. |
| 187 rtc::scoped_ptr<audioproc::Config> config_; | 184 rtc::scoped_ptr<audioproc::Config> config_; |
| 185 std::string last_serialized_config_; |
| 188 #endif | 186 #endif |
| 189 | 187 |
| 190 // Format of processing streams at input/output call sites. | 188 // Format of processing streams at input/output call sites. |
| 191 ProcessingConfig api_format_; | 189 ProcessingConfig api_format_; |
| 192 | 190 |
| 193 // Only the rate and samples fields of fwd_proc_format_ are used because the | 191 // Only the rate and samples fields of fwd_proc_format_ are used because the |
| 194 // forward processing number of channels is mutable and is tracked by the | 192 // forward processing number of channels is mutable and is tracked by the |
| 195 // capture_audio_. | 193 // capture_audio_. |
| 196 StreamConfig fwd_proc_format_; | 194 StreamConfig fwd_proc_format_; |
| 197 StreamConfig rev_proc_format_; | 195 StreamConfig rev_proc_format_; |
| (...skipping 22 matching lines...) Expand all Loading... |
| 220 rtc::scoped_ptr<Beamformer<float>> beamformer_; | 218 rtc::scoped_ptr<Beamformer<float>> beamformer_; |
| 221 const std::vector<Point> array_geometry_; | 219 const std::vector<Point> array_geometry_; |
| 222 | 220 |
| 223 bool intelligibility_enabled_; | 221 bool intelligibility_enabled_; |
| 224 rtc::scoped_ptr<IntelligibilityEnhancer> intelligibility_enhancer_; | 222 rtc::scoped_ptr<IntelligibilityEnhancer> intelligibility_enhancer_; |
| 225 }; | 223 }; |
| 226 | 224 |
| 227 } // namespace webrtc | 225 } // namespace webrtc |
| 228 | 226 |
| 229 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_ | 227 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_ |
| OLD | NEW |