commit 6604c6df260cc31dcc57b2a6dc3bb476b6526f40
author minyue@webrtc.org <minyue@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Jun 11 13:02:36 2014 +0000
committer minyue@webrtc.org <minyue@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Jun 11 13:02:36 2014 +0000
tree 5f5bf949ded989b8aa0c8a592d67d5b6ae8e9938
parent af214d804fe72bb7532081f4eb63c1a21ce74a88

Revert 6397 "(Auto)update libjingle 68949184-> 68982444"

> (Auto)update libjingle 68949184-> 68982444

TBR=buildbot@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6398 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 f75d3a6..03f7b9b 100644
--- a/talk/media/webrtc/webrtcmediaengine.cc
+++ b/talk/media/webrtc/webrtcmediaengine.cc
@@ -25,28 +25,5 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/media/webrtc/webrtcmediaengine.h"
-#include "webrtc/system_wrappers/interface/field_trial.h"
-
-WRME_EXPORT
-cricket::MediaEngineInterface* CreateWebRtcMediaEngine(
-    webrtc::AudioDeviceModule* adm,
-    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);
-}
-
-WRME_EXPORT
-void DestroyWebRtcMediaEngine(cricket::MediaEngineInterface* media_engine) {
-  if (webrtc::field_trial::FindFullName("WebRTC-NewVideoAPI") == "Enabled") {
-    delete static_cast<cricket::WebRtcMediaEngine2*>(media_engine);
-  } else {
-    delete static_cast<cricket::WebRtcMediaEngine*>(media_engine);
-  }
-}
+// TODO(pbos): Move CreateWebRtcMediaEngine here as soon as
+//             libjingle/libjingle.gyp in Chromium builds this file.

talk/media/webrtc/webrtcvideoengine.cc

diff --git a/talk/media/webrtc/webrtcvideoengine.cc b/talk/media/webrtc/webrtcvideoengine.cc
index c48f15f..49e0c52 100644
--- a/talk/media/webrtc/webrtcvideoengine.cc
+++ b/talk/media/webrtc/webrtcvideoengine.cc
@@ -62,6 +62,44 @@
 #include "talk/media/webrtc/webrtcvoiceengine.h"
 #include "webrtc/experiments.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
+#ifdef WEBRTC_CHROMIUM_BUILD
+#include "webrtc/system_wrappers/interface/field_trial.h"
+#endif
+
+#if !defined(LIBPEERCONNECTION_LIB)
+#include "talk/media/webrtc/webrtcmediaengine.h"
+
+WRME_EXPORT
+cricket::MediaEngineInterface* CreateWebRtcMediaEngine(
+    webrtc::AudioDeviceModule* adm, 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);
+  } else {
+#endif
+    return new cricket::WebRtcMediaEngine(
+        adm, adm_sc, encoder_factory, decoder_factory);
+#ifdef WEBRTC_CHROMIUM_BUILD
+  }
+#endif
+}
+
+WRME_EXPORT
+void DestroyWebRtcMediaEngine(cricket::MediaEngineInterface* media_engine) {
+#ifdef WEBRTC_CHROMIUM_BUILD
+  if (webrtc::field_trial::FindFullName("WebRTC-NewVideoAPI") == "Enabled") {
+    delete static_cast<cricket::WebRtcMediaEngine2*>(media_engine);
+  } else {
+#endif
+    delete static_cast<cricket::WebRtcMediaEngine*>(media_engine);
+#ifdef WEBRTC_CHROMIUM_BUILD
+  }
+#endif
+}
+#endif
 
 
 namespace cricket {