summaryrefslogtreecommitdiff
path: root/media/webrtc/webrtcmediaengine.cc
diff options
context:
space:
mode:
Diffstat (limited to 'media/webrtc/webrtcmediaengine.cc')
-rw-r--r--media/webrtc/webrtcmediaengine.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/media/webrtc/webrtcmediaengine.cc b/media/webrtc/webrtcmediaengine.cc
index 252b4e6..cf0fcdf 100644
--- a/media/webrtc/webrtcmediaengine.cc
+++ b/media/webrtc/webrtcmediaengine.cc
@@ -50,7 +50,6 @@ class WebRtcMediaEngine :
WebRtcVideoDecoderFactory* decoder_factory) {
voice_.SetAudioDeviceModule(adm, adm_sc);
video_.SetVoiceEngine(&voice_);
- video_.EnableTimedRender();
video_.SetExternalEncoderFactory(encoder_factory);
video_.SetExternalDecoderFactory(decoder_factory);
}
@@ -65,8 +64,9 @@ class WebRtcMediaEngine2 :
WebRtcVideoEncoderFactory* encoder_factory,
WebRtcVideoDecoderFactory* decoder_factory) {
voice_.SetAudioDeviceModule(adm, adm_sc);
+ video_.SetExternalDecoderFactory(decoder_factory);
+ video_.SetExternalEncoderFactory(encoder_factory);
video_.SetVoiceEngine(&voice_);
- video_.EnableTimedRender();
}
};
#endif // WEBRTC_CHROMIUM_BUILD
@@ -85,7 +85,6 @@ cricket::MediaEngineInterface* CreateWebRtcMediaEngine(
adm, adm_sc, encoder_factory, decoder_factory);
}
#endif // WEBRTC_CHROMIUM_BUILD
- // This is just to get a diff to run pulse.
return new cricket::WebRtcMediaEngine(
adm, adm_sc, encoder_factory, decoder_factory);
}