summaryrefslogtreecommitdiffstats
path: root/dom/media/webrtc
diff options
context:
space:
mode:
Diffstat (limited to 'dom/media/webrtc')
-rw-r--r--dom/media/webrtc/MediaEngineRemoteVideoSource.cpp3
-rw-r--r--dom/media/webrtc/MediaEngineTabVideoSource.cpp1
-rw-r--r--dom/media/webrtc/MediaEngineWebRTCAudio.cpp1
-rw-r--r--dom/media/webrtc/MediaTrackConstraints.cpp1
-rw-r--r--dom/media/webrtc/PeerIdentity.h2
-rw-r--r--dom/media/webrtc/moz.build11
6 files changed, 14 insertions, 5 deletions
diff --git a/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp b/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp
index 881d85b4a..e79d8249c 100644
--- a/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp
+++ b/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp
@@ -6,6 +6,7 @@
#include "MediaEngineRemoteVideoSource.h"
#include "mozilla/RefPtr.h"
+#include "Layers.h"
#include "VideoUtils.h"
#include "nsIPrefService.h"
#include "MediaTrackConstraints.h"
@@ -15,6 +16,8 @@ extern mozilla::LogModule* GetMediaManagerLog();
#define LOG(msg) MOZ_LOG(GetMediaManagerLog(), mozilla::LogLevel::Debug, msg)
#define LOGFRAME(msg) MOZ_LOG(GetMediaManagerLog(), mozilla::LogLevel::Verbose, msg)
+typedef mozilla::gfx::IntSize IntSize;
+
namespace mozilla {
// These need a definition somewhere because template
diff --git a/dom/media/webrtc/MediaEngineTabVideoSource.cpp b/dom/media/webrtc/MediaEngineTabVideoSource.cpp
index d101bab1e..1ac24aae5 100644
--- a/dom/media/webrtc/MediaEngineTabVideoSource.cpp
+++ b/dom/media/webrtc/MediaEngineTabVideoSource.cpp
@@ -29,6 +29,7 @@
namespace mozilla {
using namespace mozilla::gfx;
+using namespace mozilla::dom;
NS_IMPL_ISUPPORTS(MediaEngineTabVideoSource, nsIDOMEventListener, nsITimerCallback)
diff --git a/dom/media/webrtc/MediaEngineWebRTCAudio.cpp b/dom/media/webrtc/MediaEngineWebRTCAudio.cpp
index 1e2e13d01..0eda3aac1 100644
--- a/dom/media/webrtc/MediaEngineWebRTCAudio.cpp
+++ b/dom/media/webrtc/MediaEngineWebRTCAudio.cpp
@@ -9,6 +9,7 @@
#include "MediaTrackConstraints.h"
#include "mtransport/runnable_utils.h"
#include "nsAutoPtr.h"
+#include "nsContentUtils.h"
// scoped_ptr.h uses FF
#ifdef FF
diff --git a/dom/media/webrtc/MediaTrackConstraints.cpp b/dom/media/webrtc/MediaTrackConstraints.cpp
index 6225b6d49..42582e3c2 100644
--- a/dom/media/webrtc/MediaTrackConstraints.cpp
+++ b/dom/media/webrtc/MediaTrackConstraints.cpp
@@ -5,6 +5,7 @@
#include "MediaTrackConstraints.h"
#include "mozilla/dom/MediaStreamTrackBinding.h"
+#include "mozilla/Unused.h"
#include <limits>
#include <algorithm>
diff --git a/dom/media/webrtc/PeerIdentity.h b/dom/media/webrtc/PeerIdentity.h
index bdfa1d2b3..1f3413bf6 100644
--- a/dom/media/webrtc/PeerIdentity.h
+++ b/dom/media/webrtc/PeerIdentity.h
@@ -13,6 +13,8 @@
#include "nsStringAPI.h"
#endif
+#include "mozilla/RefCounted.h"
+
template <class T> class nsCOMPtr;
class nsIIDNService;
diff --git a/dom/media/webrtc/moz.build b/dom/media/webrtc/moz.build
index 66def8719..5b76e17cb 100644
--- a/dom/media/webrtc/moz.build
+++ b/dom/media/webrtc/moz.build
@@ -31,15 +31,14 @@ if CONFIG['MOZ_WEBRTC']:
UNIFIED_SOURCES += [
'MediaEngineCameraVideoSource.cpp',
'MediaEngineRemoteVideoSource.cpp',
+ ]
+ SOURCES += [
'MediaEngineTabVideoSource.cpp',
+ 'MediaEngineWebRTC.cpp',
'MediaEngineWebRTCAudio.cpp',
'RTCCertificate.cpp',
'RTCIdentityProviderRegistrar.cpp',
]
- # MediaEngineWebRTC.cpp needs to be built separately.
- SOURCES += [
- 'MediaEngineWebRTC.cpp',
- ]
LOCAL_INCLUDES += [
'/dom/base',
'/media/libyuv/include',
@@ -53,8 +52,10 @@ XPIDL_SOURCES += [
]
UNIFIED_SOURCES += [
- 'MediaEngineDefault.cpp',
'MediaTrackConstraints.cpp',
+]
+SOURCES += [
+ 'MediaEngineDefault.cpp',
'PeerIdentity.cpp',
]