Bug 1290629 - Make default cam, which is supposed to model a real cam, nonetheless independent of webrtc includes. draft
authorJan-Ivar Bruaroey <jib@mozilla.com>
Mon, 01 Aug 2016 15:36:34 -0400
changeset 395057 8174ee7fe587064276085c5f6c6b445095c77a09
parent 395056 bc217e3f030dda95b776c91c2da035629cebe182
child 526942 85bf9cb565184a330f5da5b5fcf2c8fc040d3688
push id24710
push userjbruaroey@mozilla.com
push dateMon, 01 Aug 2016 19:37:22 +0000
bugs1290629
milestone50.0a1
Bug 1290629 - Make default cam, which is supposed to model a real cam, nonetheless independent of webrtc includes. MozReview-Commit-ID: 2RiRxXCNHv6
dom/media/webrtc/MediaEngineCameraVideoSource.h
--- a/dom/media/webrtc/MediaEngineCameraVideoSource.h
+++ b/dom/media/webrtc/MediaEngineCameraVideoSource.h
@@ -4,19 +4,29 @@
 
 #ifndef MediaEngineCameraVideoSource_h
 #define MediaEngineCameraVideoSource_h
 
 #include "MediaEngine.h"
 
 #include "nsDirectoryServiceDefs.h"
 
+#ifdef MOZ_WEBRTC
 // conflicts with #include of scoped_ptr.h
 #undef FF
 #include "webrtc/video_engine/include/vie_capture.h"
+#else
+namespace webrtc
+{
+  struct CaptureCapability {
+    unsigned int width, height, maxFPS;
+    CaptureCapability() : width(0), height(0), maxFPS(0) {}
+  };
+}
+#endif
 
 namespace mozilla {
 
 bool operator == (const webrtc::CaptureCapability& a,
                   const webrtc::CaptureCapability& b);
 bool operator != (const webrtc::CaptureCapability& a,
                   const webrtc::CaptureCapability& b);