| Index: webrtc/voice_engine/include/voe_base.h
|
| diff --git a/webrtc/voice_engine/include/voe_base.h b/webrtc/voice_engine/include/voe_base.h
|
| index dec07d6409b88fa418fe54f45712a12dc879f6ac..c8aa09622449d1e1d7321cc0c9a6de91f0d41dd6 100644
|
| --- a/webrtc/voice_engine/include/voe_base.h
|
| +++ b/webrtc/voice_engine/include/voe_base.h
|
| @@ -124,20 +124,16 @@ class WEBRTC_DLLEXPORT VoEBase {
|
| // modules:
|
| // - The Audio Device Module (ADM) which implements all the audio layer
|
| // functionality in a separate (reference counted) module.
|
| - // - The AudioProcessing module handles capture-side processing. VoiceEngine
|
| - // takes ownership of this object.
|
| + // - The AudioProcessing module handles capture-side processing.
|
| // - An AudioDecoderFactory - used to create audio decoders.
|
| - // If NULL is passed for any of these, VoiceEngine will create its own.
|
| - // Returns -1 in case of an error, 0 otherwise.
|
| + // If NULL is passed for either of ADM or AudioDecoderFactory, VoiceEngine
|
| + // will create its own. Returns -1 in case of an error, 0 otherwise.
|
| // TODO(ajm): Remove default NULLs.
|
| virtual int Init(AudioDeviceModule* external_adm = NULL,
|
| - AudioProcessing* audioproc = NULL,
|
| + AudioProcessing* external_apm = nullptr,
|
| const rtc::scoped_refptr<AudioDecoderFactory>&
|
| decoder_factory = nullptr) = 0;
|
|
|
| - // Returns NULL before Init() is called.
|
| - virtual AudioProcessing* audio_processing() = 0;
|
| -
|
| // This method is WIP - DO NOT USE!
|
| // Returns NULL before Init() is called.
|
| virtual AudioDeviceModule* audio_device_module() = 0;
|
|
|