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 395239 7bf7e2fcfcdef62aa6a1c76173022c4b1a5c2d44
parent 395056 bc217e3f030dda95b776c91c2da035629cebe182
child 526951 b8d10baf0d8e93d6dbe3d6d813f192c357f83cd7
push id24720
push userjbruaroey@mozilla.com
push dateMon, 01 Aug 2016 20:12:11 +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/MediaEngineDefault.cpp
dom/media/webrtc/MediaEngineDefault.h
--- a/dom/media/webrtc/MediaEngineDefault.cpp
+++ b/dom/media/webrtc/MediaEngineDefault.cpp
@@ -33,17 +33,21 @@ namespace mozilla {
 using namespace mozilla::gfx;
 
 NS_IMPL_ISUPPORTS(MediaEngineDefaultVideoSource, nsITimerCallback)
 /**
  * Default video source.
  */
 
 MediaEngineDefaultVideoSource::MediaEngineDefaultVideoSource()
+#ifdef MOZ_WEBRTC
   : MediaEngineCameraVideoSource("FakeVideo.Monitor")
+#else
+  : MediaEngineVideoSource()
+#endif
   , mTimer(nullptr)
   , mMonitor("Fake video")
   , mCb(16), mCr(16)
 {
   mImageContainer =
     layers::LayerManager::CreateImageContainer(layers::ImageContainer::ASYNCHRONOUS);
 }
 
--- a/dom/media/webrtc/MediaEngineDefault.h
+++ b/dom/media/webrtc/MediaEngineDefault.h
@@ -13,33 +13,39 @@
 #include "nsComponentManagerUtils.h"
 #include "mozilla/Monitor.h"
 
 #include "VideoUtils.h"
 #include "MediaEngine.h"
 #include "VideoSegment.h"
 #include "AudioSegment.h"
 #include "StreamTracks.h"
+#ifdef MOZ_WEBRTC
 #include "MediaEngineCameraVideoSource.h"
+#endif
 #include "MediaStreamGraph.h"
 #include "MediaTrackConstraints.h"
 
 namespace mozilla {
 
 namespace layers {
 class ImageContainer;
 } // namespace layers
 
 class MediaEngineDefault;
 
 /**
  * The default implementation of the MediaEngine interface.
  */
 class MediaEngineDefaultVideoSource : public nsITimerCallback,
+#ifdef MOZ_WEBRTC
                                       public MediaEngineCameraVideoSource
+#else
+                                      public MediaEngineVideoSource
+#endif
 {
 public:
   MediaEngineDefaultVideoSource();
 
   void GetName(nsAString&) const override;
   void GetUUID(nsACString&) const override;
 
   nsresult Allocate(const dom::MediaTrackConstraints &aConstraints,