Bug 1290629 - Make default cam, which is supposed to model a real cam, nonetheless independent of webrtc includes.
MozReview-Commit-ID: 2RiRxXCNHv6
--- 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,