generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-land 8809 "Set WebRtcVideoEngine2 as the WebRtcMe..."

Browse Source 
I've kicked of a roll into Chromium with out the WebRtcVideoEngine2 change, to see if it was causing the roll problems, but re-landing in the meantime.

> Revert 8809 "Set WebRtcVideoEngine2 as the WebRtcMediaEngine."
> content_browsertests started failing around the time the change landed and rolls are failing now.
> I'm going to try rolling this back, start a roll, and then re-land.
> 
> > 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
> 
> TBR=pbos@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/43889004

TBR=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/50459004

Cr-Commit-Position: refs/heads/master@{#8817}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8817 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
tommi@webrtc.org 2015-03-22 12:50:30 +00:00
parent 0c3400168a
commit b789f6271a
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
talk/media/webrtc/webrtcmediaengine.cc
View File

@ -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