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

Build WebRtcMediaEngine2 outside of Chromium.

Browse Source 
Removes #ifdef WEBRTC_CHROMIUM_BUILD from
talk/media/webrtc/webrtcmediaengine.cc. WebRtcVideoEngine2 is built on
all platforms so there's no longer any need to guard this code under
ifdefs.

BUG=1788
R=sprang@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#8679}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8679 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2015-03-11 10:49:33 +00:00
parent 0d9bb8e499
commit e77c9c8df5
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,23 +25,18 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#if defined(LIBPEERCONNECTION_LIB) || \ #if defined(LIBPEERCONNECTION_LIB) || defined(LIBPEERCONNECTION_IMPLEMENTATION)
defined(LIBPEERCONNECTION_IMPLEMENTATION)
#include "talk/media/webrtc/webrtcmediaengine.h" #include "talk/media/webrtc/webrtcmediaengine.h"
#include "talk/media/webrtc/webrtcvideoengine.h" #include "talk/media/webrtc/webrtcvideoengine.h"
#ifdef WEBRTC_CHROMIUM_BUILD
#include "talk/media/webrtc/webrtcvideoengine2.h" #include "talk/media/webrtc/webrtcvideoengine2.h"
#endif
#include "talk/media/webrtc/webrtcvoiceengine.h" #include "talk/media/webrtc/webrtcvoiceengine.h"
#ifdef WEBRTC_CHROMIUM_BUILD
#include "webrtc/system_wrappers/interface/field_trial.h" #include "webrtc/system_wrappers/interface/field_trial.h"
#endif
namespace cricket { namespace cricket {
class WebRtcMediaEngine : class WebRtcMediaEngine
public CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine> { : public CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine> {
public: public:
WebRtcMediaEngine() {} WebRtcMediaEngine() {}
WebRtcMediaEngine(webrtc::AudioDeviceModule* adm, WebRtcMediaEngine(webrtc::AudioDeviceModule* adm,
@ -54,9 +49,8 @@ class WebRtcMediaEngine :
} }
}; };
#ifdef WEBRTC_CHROMIUM_BUILD class WebRtcMediaEngine2
class WebRtcMediaEngine2 : : public CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine2> {
public CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine2> {
public: public:
WebRtcMediaEngine2(webrtc::AudioDeviceModule* adm, WebRtcMediaEngine2(webrtc::AudioDeviceModule* adm,
webrtc::AudioDeviceModule* adm_sc, webrtc::AudioDeviceModule* adm_sc,
@ -67,7 +61,6 @@ class WebRtcMediaEngine2 :
video_.SetExternalEncoderFactory(encoder_factory); video_.SetExternalEncoderFactory(encoder_factory);
} }
}; };
#endif // WEBRTC_CHROMIUM_BUILD
} // namespace cricket } // namespace cricket
@ -77,14 +70,12 @@ cricket::MediaEngineInterface* CreateWebRtcMediaEngine(
webrtc::AudioDeviceModule* adm_sc, webrtc::AudioDeviceModule* adm_sc,
cricket::WebRtcVideoEncoderFactory* encoder_factory, cricket::WebRtcVideoEncoderFactory* encoder_factory,
cricket::WebRtcVideoDecoderFactory* decoder_factory) { cricket::WebRtcVideoDecoderFactory* decoder_factory) {
#ifdef WEBRTC_CHROMIUM_BUILD
if (webrtc::field_trial::FindFullName("WebRTC-NewVideoAPI") == "Enabled") { if (webrtc::field_trial::FindFullName("WebRTC-NewVideoAPI") == "Enabled") {
return new cricket::WebRtcMediaEngine2( return new cricket::WebRtcMediaEngine2(adm, adm_sc, encoder_factory,
adm, adm_sc, encoder_factory, decoder_factory); decoder_factory);
} }
#endif // WEBRTC_CHROMIUM_BUILD return new cricket::WebRtcMediaEngine(adm, adm_sc, encoder_factory,
return new cricket::WebRtcMediaEngine( decoder_factory);
adm, adm_sc, encoder_factory, decoder_factory);
} }
WRME_EXPORT WRME_EXPORT