Bug 1388288 - Make dom/media/platforms build in non-unified mode. r=jya

MozReview-Commit-ID: 43uEIDmfCMR

--HG--
extra : rebase_source : 5d5619be910d83a85459d00a8ea5f71fd91278ba

dom/media/platforms/agnostic/AOMDecoder.cpp

@@ -13,6 +13,7 @@
 #include "mozilla/SyncRunnable.h"
 #include "nsError.h"
 #include "prsystem.h"
+#include "ImageContainer.h"
 
 #include <algorithm>
 

dom/media/platforms/agnostic/DummyMediaDataDecoder.cpp

@@ -7,6 +7,7 @@
 #include "DummyMediaDataDecoder.h"
 #include "mp4_demuxer/AnnexB.h"
 #include "mp4_demuxer/H264.h"
+#include "MP4Decoder.h"
 
 namespace mozilla {
 

dom/media/platforms/agnostic/OpusDecoder.cpp

@@ -12,6 +12,7 @@
 #include "mozilla/EndianUtils.h"
 #include "mozilla/PodOperations.h"
 #include "mozilla/SyncRunnable.h"
+#include "VideoUtils.h"
 
 #include <inttypes.h>  // For PRId64
 

dom/media/platforms/agnostic/TheoraDecoder.cpp

@@ -10,6 +10,7 @@
 #include "gfx2DGlue.h"
 #include "mozilla/PodOperations.h"
 #include "nsError.h"
+#include "ImageContainer.h"
 
 #include <algorithm>
 

dom/media/platforms/agnostic/VPXDecoder.cpp

@@ -9,6 +9,7 @@
 #include "gfx2DGlue.h"
 #include "mozilla/PodOperations.h"
 #include "mozilla/SyncRunnable.h"
+#include "ImageContainer.h"
 #include "nsError.h"
 #include "prsystem.h"
 

dom/media/platforms/agnostic/VorbisDecoder.cpp

@@ -10,6 +10,7 @@
 
 #include "mozilla/PodOperations.h"
 #include "mozilla/SyncRunnable.h"
+#include "VideoUtils.h"
 
 #undef LOG
 #define LOG(type, msg) MOZ_LOG(sPDMLog, type, msg)

dom/media/platforms/agnostic/WAVDecoder.cpp

@@ -7,6 +7,7 @@
 #include "AudioSampleFormat.h"
 #include "WAVDecoder.h"
 #include "mozilla/SyncRunnable.h"
+#include "VideoUtils.h"
 
 using mp4_demuxer::ByteReader;
 

dom/media/platforms/agnostic/eme/EMEDecoderModule.cpp

@@ -21,6 +21,7 @@
 #include "nsClassHashtable.h"
 #include "nsServiceManagerUtils.h"
 #include "DecryptThroughputLimit.h"
+#include "ChromiumCDMVideoDecoder.h"
 
 namespace mozilla {
 

dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp

@@ -8,10 +8,11 @@
 #include "GMPDecoderModule.h"
 #include "GMPVideoHost.h"
 #include "MediaData.h"
-#include "VPXDecoder.h"
 #include "mozilla/EndianUtils.h"
-#include "prsystem.h"
 #include "mp4_demuxer/AnnexB.h"
+#include "MP4Decoder.h"
+#include "prsystem.h"
+#include "VPXDecoder.h"
 
 namespace mozilla {
 

dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp

@@ -23,6 +23,7 @@
 #include "mozilla/PodOperations.h"
 #include "mozilla/TaskQueue.h"
 #include "nsThreadUtils.h"
+#include "prsystem.h"
 
 
 typedef mozilla::layers::Image Image;

dom/media/platforms/wmf/DXVA2Manager.h

@@ -11,6 +11,7 @@
 #include "mozilla/Mutex.h"
 #include "nsAutoPtr.h"
 #include "nsRect.h"
+#include "D3D11.h"
 
 namespace mozilla {
 

dom/media/platforms/wmf/WMFAudioMFTManager.h

@@ -12,8 +12,6 @@
 #include "WMFMediaDataDecoder.h"
 #include "mozilla/RefPtr.h"
 
-extern const GUID CLSID_WebmMfVpxDec;
-
 namespace mozilla {
 
 class WMFAudioMFTManager : public MFTManager

dom/media/platforms/wmf/WMFDecoderModule.cpp

@@ -30,6 +30,8 @@
 #include "prsystem.h"
 #include "nsIXULRuntime.h"
 
+extern const GUID CLSID_WebmMfVpxDec;
+
 namespace mozilla {
 
 static Atomic<bool> sDXVAEnabled(false);

dom/media/platforms/wmf/WMFVideoMFTManager.cpp

@@ -20,6 +20,7 @@
 #include "gfx2DGlue.h"
 #include "gfxPrefs.h"
 #include "gfxWindowsPlatform.h"
+#include "mozilla/gfx/gfxVars.h"
 #include "mozilla/gfx/DeviceManagerDx.h"
 #include "mozilla/AbstractThread.h"
 #include "mozilla/ClearOnShutdown.h"
@@ -32,6 +33,7 @@
 #include "nsPrintfCString.h"
 #include "nsThreadUtils.h"
 #include "nsWindowsHelpers.h"
+#include "WMFDecoderModule.h"
 #include <algorithm>
 #include <psapi.h>
 #include <winsdkver.h>
@@ -63,7 +65,9 @@ const GUID MFVideoFormat_VP90 =
 };
 #endif
 
-const CLSID CLSID_WebmMfVpxDec =
+// Note: CLSID_WebmMfVpxDec needs to be extern for the CanCreateWMFDecoder
+// template in WMFDecoderModule.cpp to work.
+extern const GUID CLSID_WebmMfVpxDec =
 {
   0xe3aaf548,
   0xc9a4,