| 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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 // functionality in a separate (reference counted) module. | 126 // functionality in a separate (reference counted) module. |
| 127 // - The AudioProcessing module handles capture-side processing. | 127 // - The AudioProcessing module handles capture-side processing. |
| 128 // - An AudioDecoderFactory - used to create audio decoders. | 128 // - An AudioDecoderFactory - used to create audio decoders. |
| 129 // If NULL is passed for either of ADM or AudioDecoderFactory, VoiceEngine | 129 // If NULL is passed for either of ADM or AudioDecoderFactory, VoiceEngine |
| 130 // will create its own. Returns -1 in case of an error, 0 otherwise. | 130 // will create its own. Returns -1 in case of an error, 0 otherwise. |
| 131 // TODO(ajm): Remove default NULLs. | 131 // TODO(ajm): Remove default NULLs. |
| 132 virtual int Init(AudioDeviceModule* external_adm = NULL, | 132 virtual int Init(AudioDeviceModule* external_adm = NULL, |
| 133 AudioProcessing* external_apm = nullptr, | 133 AudioProcessing* external_apm = nullptr, |
| 134 const rtc::scoped_refptr<AudioDecoderFactory>& | 134 const rtc::scoped_refptr<AudioDecoderFactory>& |
| 135 decoder_factory = nullptr) = 0; | 135 decoder_factory = nullptr) = 0; |
| 136 | |
| 137 // Returns null before Init() is called. | |
| 138 // TODO(peah): Remove this when downstream dependencies have properly been | |
| 139 // resolved. | |
| 140 virtual AudioProcessing* audio_processing() = 0; | |
| 141 | |
| 142 // This method is WIP - DO NOT USE! | 136 // This method is WIP - DO NOT USE! |
| 143 // Returns NULL before Init() is called. | 137 // Returns NULL before Init() is called. |
| 144 virtual AudioDeviceModule* audio_device_module() = 0; | 138 virtual AudioDeviceModule* audio_device_module() = 0; |
| 145 | 139 |
| 146 // This method is WIP - DO NOT USE! | 140 // This method is WIP - DO NOT USE! |
| 147 // Returns NULL before Init() is called. | 141 // Returns NULL before Init() is called. |
| 148 virtual voe::TransmitMixer* transmit_mixer() = 0; | 142 virtual voe::TransmitMixer* transmit_mixer() = 0; |
| 149 | 143 |
| 150 // Terminates all VoiceEngine functions and releases allocated resources. | 144 // Terminates all VoiceEngine functions and releases allocated resources. |
| 151 // Returns 0. | 145 // Returns 0. |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 virtual int AssociateSendChannel(int channel, int accociate_send_channel) = 0; | 197 virtual int AssociateSendChannel(int channel, int accociate_send_channel) = 0; |
| 204 | 198 |
| 205 protected: | 199 protected: |
| 206 VoEBase() {} | 200 VoEBase() {} |
| 207 virtual ~VoEBase() {} | 201 virtual ~VoEBase() {} |
| 208 }; | 202 }; |
| 209 | 203 |
| 210 } // namespace webrtc | 204 } // namespace webrtc |
| 211 | 205 |
| 212 #endif // WEBRTC_VOICE_ENGINE_VOE_BASE_H | 206 #endif // WEBRTC_VOICE_ENGINE_VOE_BASE_H |
| OLD | NEW |