Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2504)

Unified Diff: talk/media/webrtc/webrtcmediaengine.cc

Issue 1621453005: Fix compilation if HAVE_WEBRTC_VIDEO is not defined. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixed wrong filename in gyp Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: talk/media/webrtc/webrtcmediaengine.cc
diff --git a/talk/media/webrtc/webrtcmediaengine.cc b/talk/media/webrtc/webrtcmediaengine.cc
index 31e5025a55c63a58bf1b541ae3d273de4688f56e..a014a0f4dd689ce88e460de9dec2433161545da6 100644
--- a/talk/media/webrtc/webrtcmediaengine.cc
+++ b/talk/media/webrtc/webrtcmediaengine.cc
@@ -29,13 +29,21 @@
#include <algorithm>
+#ifdef HAVE_WEBRTC_VIDEO
#include "talk/media/webrtc/webrtcvideoengine2.h"
+#else
+#include "talk/media/webrtc/nullwebrtcvideoengine.h"
+#endif
#include "talk/media/webrtc/webrtcvoiceengine.h"
namespace cricket {
class WebRtcMediaEngine2
+#ifdef HAVE_WEBRTC_VIDEO
: public CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine2> {
+#else
+ : public CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine> {
+#endif
public:
WebRtcMediaEngine2(webrtc::AudioDeviceModule* adm,
WebRtcVideoEncoderFactory* encoder_factory,
« no previous file with comments | « talk/media/webrtc/nullwebrtcvideoengine_unittest.cc ('k') | talk/media/webrtc/webrtcvideocapturer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698