| Index: webrtc/media/engine/webrtcmediaengine.h
|
| diff --git a/webrtc/media/engine/webrtcmediaengine.h b/webrtc/media/engine/webrtcmediaengine.h
|
| index dae63477d678ca728b79a091ef65d2d5e76c0a60..52c6dc227006473b0a8bb44a194d5a4126033c57 100644
|
| --- a/webrtc/media/engine/webrtcmediaengine.h
|
| +++ b/webrtc/media/engine/webrtcmediaengine.h
|
| @@ -20,6 +20,7 @@
|
| namespace webrtc {
|
| class AudioDecoderFactory;
|
| class AudioDeviceModule;
|
| +class AudioMixer;
|
| }
|
| namespace cricket {
|
| class WebRtcVideoDecoderFactory;
|
| @@ -36,14 +37,16 @@ class WebRtcMediaEngineFactory {
|
| static MediaEngineInterface* Create(
|
| webrtc::AudioDeviceModule* adm,
|
| WebRtcVideoEncoderFactory* video_encoder_factory,
|
| - WebRtcVideoDecoderFactory* video_decoder_factory);
|
| + WebRtcVideoDecoderFactory* video_decoder_factory,
|
| + rtc::scoped_refptr<webrtc::AudioMixer> audio_mixer);
|
|
|
| static MediaEngineInterface* Create(
|
| webrtc::AudioDeviceModule* adm,
|
| const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
|
| audio_decoder_factory,
|
| WebRtcVideoEncoderFactory* video_encoder_factory,
|
| - WebRtcVideoDecoderFactory* video_decoder_factory);
|
| + WebRtcVideoDecoderFactory* video_decoder_factory,
|
| + rtc::scoped_refptr<webrtc::AudioMixer> audio_mixer);
|
| };
|
|
|
| // Verify that extension IDs are within 1-byte extension range and are not
|
|
|