From 66df3cf7ab7c2fa743d428cb1b44197906810141 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Fri, 20 Mar 2015 15:44:49 +0000 Subject: [PATCH] Set WebRtcVideoEngine2 as the WebRtcMediaEngine. Removes the experiment launching WebRTC-NewVideoAPI. This field trial has shown no major regressions on Chrome Canary/Dev that haven't been addressed, so enabling it in time before feature freeze. BUG=1788 R=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/44759004 Cr-Commit-Position: refs/heads/master@{#8809} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8809 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/webrtc/webrtcmediaengine.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/talk/media/webrtc/webrtcmediaengine.cc b/talk/media/webrtc/webrtcmediaengine.cc index 71a77acda..438728df7 100644 --- a/talk/media/webrtc/webrtcmediaengine.cc +++ b/talk/media/webrtc/webrtcmediaengine.cc @@ -70,12 +70,8 @@ cricket::MediaEngineInterface* CreateWebRtcMediaEngine( webrtc::AudioDeviceModule* adm_sc, cricket::WebRtcVideoEncoderFactory* encoder_factory, cricket::WebRtcVideoDecoderFactory* decoder_factory) { - if (webrtc::field_trial::FindFullName("WebRTC-NewVideoAPI") == "Enabled") { - return new cricket::WebRtcMediaEngine2(adm, adm_sc, encoder_factory, - decoder_factory); - } - return new cricket::WebRtcMediaEngine(adm, adm_sc, encoder_factory, - decoder_factory); + return new cricket::WebRtcMediaEngine2(adm, adm_sc, encoder_factory, + decoder_factory); } WRME_EXPORT