Chromium Code Reviews| 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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 117 // Removes and disables the observer class for runtime error control | 117 // Removes and disables the observer class for runtime error control |
| 118 // and warning notifications. Returns 0. | 118 // and warning notifications. Returns 0. |
| 119 virtual int DeRegisterVoiceEngineObserver() = 0; | 119 virtual int DeRegisterVoiceEngineObserver() = 0; |
| 120 | 120 |
| 121 // Initializes all common parts of the VoiceEngine; e.g. all | 121 // Initializes all common parts of the VoiceEngine; e.g. all |
| 122 // encoders/decoders, the sound card and core receiving components. | 122 // encoders/decoders, the sound card and core receiving components. |
| 123 // This method also makes it possible to install some user-defined external | 123 // This method also makes it possible to install some user-defined external |
| 124 // modules: | 124 // modules: |
| 125 // - The Audio Device Module (ADM) which implements all the audio layer | 125 // - The Audio Device Module (ADM) which implements all the audio layer |
| 126 // functionality in a separate (reference counted) module. | 126 // functionality in a separate (reference counted) module. |
| 127 // - The AudioProcessing module handles capture-side processing. VoiceEngine | 127 // - The AudioProcessing module handles capture-side processing. |
| 128 // takes ownership of this object. | |
| 129 // - An AudioDecoderFactory - used to create audio decoders. | 128 // - An AudioDecoderFactory - used to create audio decoders. |
| 130 // If NULL is passed for any of these, VoiceEngine will create its own. | 129 // If NULL is passed for either of ADM or AudioDecoderFactory, VoiceEngine |
| 131 // Returns -1 in case of an error, 0 otherwise. | 130 // will create its own. Returns -1 in case of an error, 0 otherwise. |
| 132 // TODO(ajm): Remove default NULLs. | 131 // TODO(ajm): Remove default NULLs. |
| 133 virtual int Init(AudioDeviceModule* external_adm = NULL, | 132 virtual int Init(AudioDeviceModule* external_adm = NULL, |
| 134 AudioProcessing* audioproc = NULL, | 133 AudioProcessing* external_apm = nullptr, |
| 135 const rtc::scoped_refptr<AudioDecoderFactory>& | 134 const rtc::scoped_refptr<AudioDecoderFactory>& |
| 136 decoder_factory = nullptr) = 0; | 135 decoder_factory = nullptr) = 0; |
| 137 | 136 |
| 138 // Returns NULL before Init() is called. | 137 // Returns NULL before Init() is called. |
|
Taylor Brandstetter
2017/06/28 07:19:38
nit: We generally use "null" in comments, reservin
peah-webrtc
2017/06/29 11:46:31
Done.
| |
| 138 // TODO(peah): Remove this when upstream dependencies have properly been | |
|
Taylor Brandstetter
2017/06/28 07:19:38
nit: upstream vs downstream question here too
peah-webrtc
2017/06/29 11:46:31
Done.
| |
| 139 // resolved. | |
| 139 virtual AudioProcessing* audio_processing() = 0; | 140 virtual AudioProcessing* audio_processing() = 0; |
| 140 | 141 |
| 141 // This method is WIP - DO NOT USE! | 142 // This method is WIP - DO NOT USE! |
| 142 // Returns NULL before Init() is called. | 143 // Returns NULL before Init() is called. |
| 143 virtual AudioDeviceModule* audio_device_module() = 0; | 144 virtual AudioDeviceModule* audio_device_module() = 0; |
| 144 | 145 |
| 145 // This method is WIP - DO NOT USE! | 146 // This method is WIP - DO NOT USE! |
| 146 // Returns NULL before Init() is called. | 147 // Returns NULL before Init() is called. |
| 147 virtual voe::TransmitMixer* transmit_mixer() = 0; | 148 virtual voe::TransmitMixer* transmit_mixer() = 0; |
| 148 | 149 |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 202 virtual int AssociateSendChannel(int channel, int accociate_send_channel) = 0; | 203 virtual int AssociateSendChannel(int channel, int accociate_send_channel) = 0; |
| 203 | 204 |
| 204 protected: | 205 protected: |
| 205 VoEBase() {} | 206 VoEBase() {} |
| 206 virtual ~VoEBase() {} | 207 virtual ~VoEBase() {} |
| 207 }; | 208 }; |
| 208 | 209 |
| 209 } // namespace webrtc | 210 } // namespace webrtc |
| 210 | 211 |
| 211 #endif // WEBRTC_VOICE_ENGINE_VOE_BASE_H | 212 #endif // WEBRTC_VOICE_ENGINE_VOE_BASE_H |
| OLD | NEW |