| Index: webrtc/media/engine/webrtcvoiceengine.h
|
| diff --git a/webrtc/media/engine/webrtcvoiceengine.h b/webrtc/media/engine/webrtcvoiceengine.h
|
| index 03b493744b857f903cbb09f530794787466e7b8f..4032814705565e409ed86223b0c771fe0f2aca78 100644
|
| --- a/webrtc/media/engine/webrtcvoiceengine.h
|
| +++ b/webrtc/media/engine/webrtcvoiceengine.h
|
| @@ -34,6 +34,7 @@
|
| namespace cricket {
|
|
|
| class AudioDeviceModule;
|
| +class AudioMixer;
|
| class AudioSource;
|
| class VoEWrapper;
|
| class WebRtcVoiceMediaChannel;
|
| @@ -48,11 +49,13 @@ class WebRtcVoiceEngine final : public webrtc::TraceCallback {
|
|
|
| WebRtcVoiceEngine(
|
| webrtc::AudioDeviceModule* adm,
|
| - const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& decoder_factory);
|
| + const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& decoder_factory,
|
| + rtc::scoped_refptr<webrtc::AudioMixer> audio_mixer);
|
| // Dependency injection for testing.
|
| WebRtcVoiceEngine(
|
| webrtc::AudioDeviceModule* adm,
|
| const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& decoder_factory,
|
| + rtc::scoped_refptr<webrtc::AudioMixer> audio_mixer,
|
| VoEWrapper* voe_wrapper);
|
| ~WebRtcVoiceEngine() override;
|
|
|
|
|