commit e77c9c8df54d6a14a27e7c5e16bf55fb121426ef
author pbos@webrtc.org <pbos@webrtc.org> Wed Mar 11 10:49:33 2015 +0000
committer pbos@webrtc.org <pbos@webrtc.org> Wed Mar 11 10:50:16 2015 +0000
tree 243b00310bb3d52878a712f16a4bb441d085cbd5
parent 0d9bb8e499f52a53292fdb6dfa7dc956f6bff85b

Build WebRtcMediaEngine2 outside of Chromium.

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

talk/media/webrtc/webrtcmediaengine.cc

diff --git a/talk/media/webrtc/webrtcmediaengine.cc b/talk/media/webrtc/webrtcmediaengine.cc
index 0f3a240..71a77ac 100644
--- a/talk/media/webrtc/webrtcmediaengine.cc
+++ b/talk/media/webrtc/webrtcmediaengine.cc
@@ -25,38 +25,32 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBPEERCONNECTION_LIB) || \
-    defined(LIBPEERCONNECTION_IMPLEMENTATION)
+#if defined(LIBPEERCONNECTION_LIB) || defined(LIBPEERCONNECTION_IMPLEMENTATION)
 
 #include "talk/media/webrtc/webrtcmediaengine.h"
 #include "talk/media/webrtc/webrtcvideoengine.h"
-#ifdef WEBRTC_CHROMIUM_BUILD
 #include "talk/media/webrtc/webrtcvideoengine2.h"
-#endif
 #include "talk/media/webrtc/webrtcvoiceengine.h"
-#ifdef WEBRTC_CHROMIUM_BUILD
 #include "webrtc/system_wrappers/interface/field_trial.h"
-#endif
 
 namespace cricket {
 
-class WebRtcMediaEngine :
-      public CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine> {
+class WebRtcMediaEngine
+    : public CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine> {
  public:
   WebRtcMediaEngine() {}
   WebRtcMediaEngine(webrtc::AudioDeviceModule* adm,
-      webrtc::AudioDeviceModule* adm_sc,
-      WebRtcVideoEncoderFactory* encoder_factory,
-      WebRtcVideoDecoderFactory* decoder_factory) {
+                    webrtc::AudioDeviceModule* adm_sc,
+                    WebRtcVideoEncoderFactory* encoder_factory,
+                    WebRtcVideoDecoderFactory* decoder_factory) {
     voice_.SetAudioDeviceModule(adm, adm_sc);
     video_.SetExternalEncoderFactory(encoder_factory);
     video_.SetExternalDecoderFactory(decoder_factory);
   }
 };
 
-#ifdef WEBRTC_CHROMIUM_BUILD
-class WebRtcMediaEngine2 :
-      public CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine2> {
+class WebRtcMediaEngine2
+    : public CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine2> {
  public:
   WebRtcMediaEngine2(webrtc::AudioDeviceModule* adm,
                      webrtc::AudioDeviceModule* adm_sc,
@@ -67,7 +61,6 @@
     video_.SetExternalEncoderFactory(encoder_factory);
   }
 };
-#endif  // WEBRTC_CHROMIUM_BUILD
 
 }  // namespace cricket
 
@@ -77,14 +70,12 @@
     webrtc::AudioDeviceModule* adm_sc,
     cricket::WebRtcVideoEncoderFactory* encoder_factory,
     cricket::WebRtcVideoDecoderFactory* decoder_factory) {
-#ifdef WEBRTC_CHROMIUM_BUILD
   if (webrtc::field_trial::FindFullName("WebRTC-NewVideoAPI") == "Enabled") {
-    return new cricket::WebRtcMediaEngine2(
-        adm, adm_sc, encoder_factory, decoder_factory);
+    return new cricket::WebRtcMediaEngine2(adm, adm_sc, encoder_factory,
+                                           decoder_factory);
   }
-#endif // WEBRTC_CHROMIUM_BUILD
-  return new cricket::WebRtcMediaEngine(
-      adm, adm_sc, encoder_factory, decoder_factory);
+  return new cricket::WebRtcMediaEngine(adm, adm_sc, encoder_factory,
+                                        decoder_factory);
 }
 
 WRME_EXPORT