Merge remote-tracking branch 'origin/master' into custom

dom/media/Benchmark.cpp

@@ -11,6 +11,7 @@
 #include "PDMFactory.h"
 #include "WebMDemuxer.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/SharedThreadPool.h"
 #include "mozilla/dom/ContentChild.h"
 
 #ifndef MOZ_WIDGET_ANDROID

dom/media/CanvasCaptureMediaStream.cpp

@@ -8,6 +8,7 @@
 #include "gfxPlatform.h"
 #include "ImageContainer.h"
 #include "MediaStreamGraph.h"
+#include "MediaStreamListener.h"
 #include "mozilla/dom/CanvasCaptureMediaStreamBinding.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/Atomics.h"

dom/media/CubebUtils.cpp

@@ -10,6 +10,8 @@
 #include "nsDebug.h"
 #include "nsString.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/Services.h"
+#include "mozilla/Sprintf.h"
 #include "mozilla/StaticMutex.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/Telemetry.h"

dom/media/DOMMediaStream.cpp

@@ -14,6 +14,7 @@
 #include "mozilla/dom/MediaStreamTrackEvent.h"
 #include "mozilla/dom/LocalMediaStreamBinding.h"
 #include "mozilla/dom/AudioNode.h"
+#include "AudioCaptureStream.h"
 #include "AudioChannelAgent.h"
 #include "mozilla/dom/AudioTrack.h"
 #include "mozilla/dom/AudioTrackList.h"
@@ -22,6 +23,7 @@
 #include "mozilla/dom/HTMLCanvasElement.h"
 #include "mozilla/media/MediaUtils.h"
 #include "MediaStreamGraph.h"
+#include "MediaStreamListener.h"
 #include "AudioStreamTrack.h"
 #include "VideoStreamTrack.h"
 #include "Layers.h"

dom/media/MediaDecoder.cpp

@@ -784,6 +784,13 @@ MediaDecoder::CallSeek(const SeekTarget& aTarget, dom::Promise* aPromise)
            &MediaDecoder::OnSeekResolved, &MediaDecoder::OnSeekRejected));
 }
 
+// GetCurrentTime is defined in winbase.h as a zero argument macro forwarding to
+// GetTickCount(), which conflicts with the MediaDecoder::GetCurrentTime
+// implementation here. Clear the macro.
+#ifdef GetCurrentTime
+#undef GetCurrentTime
+#endif
+
 double
 MediaDecoder::GetCurrentTime()
 {

dom/media/MediaDecoderReader.cpp

@@ -14,6 +14,7 @@
 #include "nsPrintfCString.h"
 #include "mozilla/mozalloc.h"
 #include "mozilla/Mutex.h"
+#include "mozilla/SharedThreadPool.h"
 #include <stdint.h>
 #include <algorithm>
 

dom/media/MediaStreamListener.h

@@ -7,7 +7,9 @@
 #ifndef MOZILLA_MEDIASTREAMLISTENER_h_
 #define MOZILLA_MEDIASTREAMLISTENER_h_
 
+#include "MediaStreamGraph.h"
 #include "StreamTracks.h"
+#include "MediaStreamGraph.h"
 
 namespace mozilla {
 

dom/media/MediaStreamTrack.cpp

@@ -7,8 +7,10 @@
 
 #include "DOMMediaStream.h"
 #include "MediaStreamGraph.h"
+#include "nsContentUtils.h"
 #include "nsIUUIDGenerator.h"
 #include "nsServiceManagerUtils.h"
+#include "MediaStreamError.h"
 #include "MediaStreamListener.h"
 #include "systemservices/MediaUtils.h"
 
@@ -21,6 +23,8 @@
 static mozilla::LazyLogModule gMediaStreamTrackLog("MediaStreamTrack");
 #define LOG(type, msg) MOZ_LOG(gMediaStreamTrackLog, type, msg)
 
+using namespace mozilla::media;
+
 namespace mozilla {
 namespace dom {
 

dom/media/eme/MediaKeySystemAccess.cpp

@@ -36,9 +36,11 @@
 #include "mozilla/ClearOnShutdown.h"
 #include "nsUnicharUtils.h"
 #include "mozilla/dom/MediaSource.h"
+#include "DecoderTraits.h"
 #ifdef MOZ_WIDGET_ANDROID
 #include "FennecJNIWrappers.h"
 #endif
+
 namespace mozilla {
 namespace dom {
 

dom/media/eme/mediadrm/moz.build

@@ -10,7 +10,7 @@ EXPORTS.mozilla += [
     'MediaDrmProxySupport.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'MediaDrmCDMCallbackProxy.cpp',
     'MediaDrmCDMProxy.cpp',
     'MediaDrmProxySupport.cpp',

dom/media/eme/moz.build

@@ -23,7 +23,7 @@ EXPORTS.mozilla += [
     'EMEUtils.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'CDMCaps.cpp',
     'DetailedPromise.cpp',
     'EMEUtils.cpp',

dom/media/encoder/OpusTrackEncoder.cpp

@@ -2,7 +2,9 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 #include "OpusTrackEncoder.h"
+#include "VideoUtils.h"
 #include "nsString.h"
 #include "GeckoProfiler.h"
 

dom/media/encoder/moz.build

@@ -16,7 +16,7 @@ EXPORTS += [
     'TrackMetadataBase.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'MediaEncoder.cpp',
     'OpusTrackEncoder.cpp',
     'TrackEncoder.cpp',
@@ -25,8 +25,10 @@ UNIFIED_SOURCES += [
 if CONFIG['MOZ_WEBM_ENCODER']:
     EXPORTS += ['VP8TrackEncoder.h',
     ]
-    UNIFIED_SOURCES += ['VP8TrackEncoder.cpp',
+
+    SOURCES += ['VP8TrackEncoder.cpp',
     ]
+
     LOCAL_INCLUDES += ['/media/libyuv/include']
 
 FINAL_LIBRARY = 'xul'

dom/media/flac/FlacDemuxer.cpp

@@ -33,14 +33,6 @@ namespace flac {
 // flac::FrameHeader - Holds the flac frame header and its parsing
 // state.
 
-#define FLAC_MAX_CHANNELS           8
-#define FLAC_MIN_BLOCKSIZE         16
-#define FLAC_MAX_BLOCKSIZE      65535
-#define FLAC_MIN_FRAME_SIZE        11
-#define FLAC_MAX_FRAME_HEADER_SIZE 16
-#define FLAC_MAX_FRAME_SIZE (FLAC_MAX_FRAME_HEADER_SIZE \
-                             +FLAC_MAX_BLOCKSIZE*FLAC_MAX_CHANNELS*3)
-
 class FrameHeader {
 public:
   const AudioInfo& Info() const { return mInfo; }

dom/media/flac/FlacDemuxer.h

@@ -13,6 +13,15 @@
 namespace mozilla {
 
 namespace flac {
+
+#define FLAC_MAX_CHANNELS           8
+#define FLAC_MIN_BLOCKSIZE         16
+#define FLAC_MAX_BLOCKSIZE      65535
+#define FLAC_MIN_FRAME_SIZE        11
+#define FLAC_MAX_FRAME_HEADER_SIZE 16
+#define FLAC_MAX_FRAME_SIZE (FLAC_MAX_FRAME_HEADER_SIZE \
+                             +FLAC_MAX_BLOCKSIZE*FLAC_MAX_CHANNELS*3)
+
 class Frame;
 class FrameParser;
 }

dom/media/flac/FlacFrameParser.cpp

@@ -7,6 +7,7 @@
 #include "FlacFrameParser.h"
 #include "mp4_demuxer/ByteReader.h"
 #include "nsTArray.h"
+#include "FlacDemuxer.h"
 #include "OggCodecState.h"
 #include "OpusParser.h"
 #include "VideoUtils.h"

dom/media/flac/moz.build

@@ -10,7 +10,7 @@ EXPORTS += [
     'FlacFrameParser.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'FlacDecoder.cpp',
     'FlacDemuxer.cpp',
     'FlacFrameParser.cpp',

dom/media/fmp4/moz.build

@@ -10,13 +10,10 @@ EXPORTS += [
     'MP4Stream.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'MP4Decoder.cpp',
+    'MP4Demuxer.cpp',
     'MP4Stream.cpp',
 ]
 
-SOURCES += [
-    'MP4Demuxer.cpp',
-]
-
 FINAL_LIBRARY = 'xul'

dom/media/gmp/GMPDecryptorParent.cpp

@@ -4,7 +4,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "GMPDecryptorParent.h"
+
 #include "GMPContentParent.h"
+#include "GMPUtils.h"
 #include "MediaData.h"
 #include "mozilla/Unused.h"
 

dom/media/gmp/GMPUtils.cpp

@@ -10,8 +10,10 @@
 #include "nsCOMPtr.h"
 #include "nsLiteralString.h"
 #include "nsCRTGlue.h"
+#include "mozIGeckoMediaPluginService.h"
 #include "mozilla/Base64.h"
 #include "nsISimpleEnumerator.h"
+#include "prio.h"
 
 namespace mozilla {
 

dom/media/gmp/moz.build

@@ -83,7 +83,7 @@ if CONFIG['OS_TARGET'] == 'Android':
         'rlz',
     ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'GMPAudioDecoderChild.cpp',
     'GMPAudioDecoderParent.cpp',
     'GMPAudioHost.cpp',

dom/media/imagecapture/CaptureTask.cpp

@@ -15,24 +15,6 @@
 
 namespace mozilla {
 
-class CaptureTask::MediaStreamEventListener : public MediaStreamTrackListener
-{
-public:
-  explicit MediaStreamEventListener(CaptureTask* aCaptureTask)
-    : mCaptureTask(aCaptureTask) {};
-
-  // MediaStreamListener methods.
-  void NotifyEnded() override
-  {
-    if(!mCaptureTask->mImageGrabbedOrTrackEnd) {
-      mCaptureTask->PostTrackEndEvent();
-    }
-  }
-
-private:
-  CaptureTask* mCaptureTask;
-};
-
 CaptureTask::CaptureTask(dom::ImageCapture* aImageCapture)
   : mImageCapture(aImageCapture)
   , mEventListener(new MediaStreamEventListener(this))

dom/media/imagecapture/CaptureTask.h

@@ -86,6 +86,24 @@ protected:
   bool mPrincipalChanged;
 };
 
+class CaptureTask::MediaStreamEventListener : public MediaStreamTrackListener
+{
+public:
+  explicit MediaStreamEventListener(CaptureTask* aCaptureTask)
+    : mCaptureTask(aCaptureTask) {};
+
+  // MediaStreamListener methods.
+  void NotifyEnded() override
+  {
+    if(!mCaptureTask->mImageGrabbedOrTrackEnd) {
+      mCaptureTask->PostTrackEndEvent();
+    }
+  }
+
+private:
+  CaptureTask* mCaptureTask;
+};
+
 } // namespace mozilla
 
 #endif // CAPTURETASK_H

dom/media/imagecapture/moz.build

@@ -8,7 +8,7 @@ EXPORTS.mozilla.dom += [
     'ImageCapture.h'
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'CaptureTask.cpp',
     'ImageCapture.cpp',
 ]

dom/media/mediasink/DecodedStream.cpp

@@ -19,6 +19,8 @@
 #include "VideoSegment.h"
 #include "VideoUtils.h"
 
+#include "nsPrintfCString.h"
+
 namespace mozilla {
 
 #undef DUMP_LOG

dom/media/mediasink/VideoSink.cpp

@@ -4,9 +4,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "MediaStreamGraph.h"
 #include "MediaQueue.h"
 #include "VideoSink.h"
 #include "MediaPrefs.h"
+#include "nsPrintfCString.h"
 
 namespace mozilla {
 

dom/media/mediasink/moz.build

@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'AudioSinkWrapper.cpp',
     'DecodedAudioDataSink.cpp',
     'DecodedStream.cpp',

dom/media/mediasource/TrackBuffersManager.cpp

@@ -40,6 +40,7 @@ using media::TimeUnit;
 using media::TimeInterval;
 using media::TimeIntervals;
 typedef SourceBufferTask::AppendBufferResult AppendBufferResult;
+typedef SourceBufferAttributes::AppendState AppendState; 
 
 static const char*
 AppendStateToStr(SourceBufferAttributes::AppendState aState)

dom/media/mediasource/moz.build

@@ -21,7 +21,7 @@ EXPORTS.mozilla.dom += [
     'SourceBufferList.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'ContainerParser.cpp',
     'MediaSource.cpp',
     'MediaSourceDecoder.cpp',

dom/media/moz.build

@@ -182,7 +182,7 @@ EXPORTS.mozilla.dom += [
     'VideoTrackList.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'AccurateSeekTask.cpp',
     'ADTSDecoder.cpp',
     'ADTSDemuxer.cpp',
@@ -199,6 +199,7 @@ UNIFIED_SOURCES += [
     'CanvasCaptureMediaStream.cpp',
     'CubebUtils.cpp',
     'DecoderDoctorDiagnostics.cpp',
+    'DecoderTraits.cpp',
     'DOMMediaStream.cpp',
     'EncodedBufferCache.cpp',
     'FileBlockCache.cpp',
@@ -254,11 +255,6 @@ UNIFIED_SOURCES += [
 if CONFIG['OS_TARGET'] == 'WINNT':
   SOURCES += [ 'ThreadPoolCOMListener.cpp' ]
 
-# DecoderTraits.cpp needs to be built separately because of Mac OS X headers.
-SOURCES += [
-    'DecoderTraits.cpp',
-]
-
 # Some codec-related code uses multi-character constants, which GCC and clang
 # warn about. Suppress turning this warning into an error.
 if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']:

dom/media/mp3/moz.build

@@ -9,7 +9,7 @@ EXPORTS += [
     'MP3Demuxer.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'MP3Decoder.cpp',
     'MP3Demuxer.cpp',
 ]

dom/media/ogg/OggDemuxer.cpp

@@ -21,6 +21,7 @@
 #include <algorithm>
 
 extern mozilla::LazyLogModule gMediaDemuxerLog;
+#define LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 #define OGG_DEBUG(arg, ...) MOZ_LOG(gMediaDemuxerLog, mozilla::LogLevel::Debug, ("OggDemuxer(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
 
 // Un-comment to enable logging of seek bisections.

dom/media/ogg/moz.build

@@ -13,7 +13,7 @@ EXPORTS += [
     'OpusParser.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'OggCodecState.cpp',
     'OggCodecStore.cpp',
     'OggDecoder.cpp',

dom/media/platforms/PlatformDecoderModule.h

@@ -7,6 +7,7 @@
 #if !defined(PlatformDecoderModule_h_)
 #define PlatformDecoderModule_h_
 
+#include "DecoderDoctorDiagnostics.h"
 #include "MediaDecoderReader.h"
 #include "MediaInfo.h"
 #include "mozilla/MozPromise.h"

dom/media/platforms/agnostic/TheoraDecoder.cpp

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

dom/media/platforms/agnostic/eme/moz.build

@@ -11,7 +11,7 @@ EXPORTS += [
     'SamplesWaitingForKey.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'EMEAudioDecoder.cpp',
     'EMEDecoderModule.cpp',
     'EMEVideoDecoder.cpp',

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

@@ -10,6 +10,7 @@
 #include "prsystem.h"
 #include "MediaData.h"
 #include "GMPDecoderModule.h"
+#include "MP4Decoder.h"
 #include "VPXDecoder.h"
 
 namespace mozilla {

dom/media/platforms/agnostic/gmp/moz.build

@@ -11,7 +11,7 @@ EXPORTS += [
     'MediaDataDecoderProxy.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'GMPAudioDecoder.cpp',
     'GMPDecoderModule.cpp',
     'GMPVideoDecoder.cpp',

dom/media/platforms/apple/AppleCMLinker.cpp

@@ -7,7 +7,9 @@
 #include <dlfcn.h>
 
 #include "AppleCMLinker.h"
+#include "PlatformDecoderModule.h"
 #include "mozilla/ArrayUtils.h"
+#include "mozilla/Logging.h"
 #include "nsDebug.h"
 
 #define LOG(...) MOZ_LOG(sPDMLog, mozilla::LogLevel::Debug, (__VA_ARGS__))

dom/media/platforms/apple/AppleVTDecoder.cpp

@@ -11,12 +11,15 @@
 #include "AppleUtils.h"
 #include "AppleVTDecoder.h"
 #include "AppleVTLinker.h"
+#include "MacIOSurfaceImage.h"
 #include "MediaData.h"
 #include "mozilla/ArrayUtils.h"
 #include "mp4_demuxer/H264.h"
 #include "nsAutoPtr.h"
 #include "nsThreadUtils.h"
 #include "mozilla/Logging.h"
+#include "mozilla/SyncRunnable.h"
+#include "mozilla/gfx/MacIOSurface.h"
 #include "VideoUtils.h"
 #include "gfxPlatform.h"
 
@@ -360,7 +363,7 @@ AppleVTDecoder::OutputFrame(CVPixelBufferRef aImage,
 
     RefPtr<MacIOSurface> macSurface = new MacIOSurface(surface);
 
-    RefPtr<layers::Image> image = new MacIOSurfaceImage(macSurface);
+    RefPtr<layers::Image> image = new layers::MacIOSurfaceImage(macSurface);
 
     data =
       VideoData::CreateFromImage(info,

dom/media/platforms/apple/AppleVTLinker.cpp

@@ -7,7 +7,9 @@
 #include <dlfcn.h>
 
 #include "AppleVTLinker.h"
+#include "PlatformDecoderModule.h"
 #include "mozilla/ArrayUtils.h"
+#include "mozilla/Logging.h"
 #include "nsDebug.h"
 
 #define LOG(...) MOZ_LOG(sPDMLog, mozilla::LogLevel::Debug, (__VA_ARGS__))

dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp

@@ -17,6 +17,7 @@
 #include "FFmpegLog.h"
 #include "MediaPrefs.h"
 #include "mozilla/PodOperations.h"
+#include "prsystem.h" // for PR_GetNumberOfProcessors
 
 #include "libavutil/pixfmt.h"
 #if LIBAVCODEC_VERSION_MAJOR < 54

dom/media/platforms/ffmpeg/ffmpeg57/moz.build

@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
     '../FFmpegAudioDecoder.cpp',
     '../FFmpegDataDecoder.cpp',
     '../FFmpegDecoderModule.cpp',

dom/media/platforms/ffmpeg/ffmpeg58/moz.build

@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
     '../FFmpegAudioDecoder.cpp',
     '../FFmpegDataDecoder.cpp',
     '../FFmpegDecoderModule.cpp',

dom/media/platforms/ffmpeg/ffvpx/moz.build

@@ -9,7 +9,7 @@ EXPORTS += [
     'FFVPXRuntimeLinker.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     '../FFmpegAudioDecoder.cpp',
     '../FFmpegDataDecoder.cpp',
     '../FFmpegDecoderModule.cpp',

dom/media/platforms/ffmpeg/libav53/moz.build

@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
     '../FFmpegAudioDecoder.cpp',
     '../FFmpegDataDecoder.cpp',
     '../FFmpegDecoderModule.cpp',

dom/media/platforms/ffmpeg/libav54/moz.build

@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
     '../FFmpegAudioDecoder.cpp',
     '../FFmpegDataDecoder.cpp',
     '../FFmpegDecoderModule.cpp',

dom/media/platforms/ffmpeg/libav55/moz.build

@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
     '../FFmpegAudioDecoder.cpp',
     '../FFmpegDataDecoder.cpp',
     '../FFmpegDecoderModule.cpp',

dom/media/platforms/ffmpeg/moz.build

@@ -16,7 +16,7 @@ DIRS += [
     'ffmpeg58',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'FFmpegRuntimeLinker.cpp',
 ]
 

dom/media/platforms/moz.build

@@ -16,7 +16,7 @@ EXPORTS += [
     'wrappers/H264Converter.h'
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'agnostic/AgnosticDecoderModule.cpp',
     'agnostic/BlankDecoderModule.cpp',
     'agnostic/OpusDecoder.cpp',
@@ -40,7 +40,7 @@ if CONFIG['MOZ_WMF']:
 
 if CONFIG['MOZ_FFVPX'] or CONFIG['MOZ_FFMPEG']:
     # common code to either FFmpeg or FFVPX
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'ffmpeg/FFmpegLibWrapper.cpp',
     ]
 
@@ -58,7 +58,7 @@ if CONFIG['MOZ_AV1']:
     EXPORTS += [
         'agnostic/AOMDecoder.h',
     ]
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'agnostic/AOMDecoder.cpp',
     ]
 
@@ -66,7 +66,7 @@ if CONFIG['MOZ_APPLEMEDIA']:
   EXPORTS += [
       'apple/AppleDecoderModule.h',
   ]
-  UNIFIED_SOURCES += [
+  SOURCES += [
       'apple/AppleATDecoder.cpp',
       'apple/AppleCMLinker.cpp',
       'apple/AppleDecoderModule.cpp',
@@ -83,7 +83,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     EXPORTS += [
         'android/AndroidDecoderModule.h',
     ]
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'android/AndroidDecoderModule.cpp',
         'android/MediaCodecDataDecoder.cpp',
         'android/RemoteDataDecoder.cpp',

dom/media/platforms/omx/OmxPlatformLayer.cpp

@@ -6,6 +6,8 @@
 
 #include "OmxPlatformLayer.h"
 
+#include "OmxDataDecoder.h"
+
 #include "OMX_VideoExt.h" // For VP8.
 
 #include "VPXDecoder.h"

dom/media/platforms/omx/OmxPlatformLayer.h

@@ -7,6 +7,7 @@
 #if !defined(OmxPlatformLayer_h_)
 #define OmxPlatformLayer_h_
 
+#include "OMX_Component.h"
 #include "OMX_Core.h"
 #include "OMX_Types.h"
 

dom/media/platforms/omx/moz.build

@@ -8,7 +8,7 @@ EXPORTS += [
     'OmxDecoderModule.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'OmxDataDecoder.cpp',
     'OmxDecoderModule.cpp',
     'OmxPlatformLayer.cpp',

dom/media/platforms/wmf/moz.build

@@ -14,6 +14,7 @@ EXPORTS += [
     'WMFUtils.h',
     'WMFVideoMFTManager.h',
 ]
+
 UNIFIED_SOURCES += [
     'DXVA2Manager.cpp',
     'MFTDecoder.cpp',

dom/media/platforms/wrappers/FuzzingWrapper.cpp

@@ -6,6 +6,8 @@
 
 #include "FuzzingWrapper.h"
 
+#include "mozilla/SharedThreadPool.h"
+
 mozilla::LogModule* GetFuzzingWrapperLog() {
   static mozilla::LazyLogModule log("MediaFuzzingWrapper");
   return log;

dom/media/platforms/wrappers/H264Converter.cpp

@@ -6,9 +6,11 @@
 
 #include "mozilla/TaskQueue.h"
 
+#include "DecoderDoctorDiagnostics.h"
 #include "H264Converter.h"
 #include "ImageContainer.h"
 #include "MediaInfo.h"
+#include "PDMFactory.h"
 #include "mp4_demuxer/AnnexB.h"
 #include "mp4_demuxer/H264.h"
 

dom/media/standalone/moz.build

@@ -7,7 +7,7 @@
 if CONFIG['OS_TARGET'] != 'WINNT':
     Library('media_standalone')
 
-UNIFIED_SOURCES += [
+SOURCES += [
     '../AudioChannelFormat.cpp',
     '../AudioSegment.cpp',
     '../SimpleImageBuffer.cpp',

dom/media/systemservices/MediaParent.cpp

@@ -23,6 +23,7 @@
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsISupportsImpl.h"
 #include "mozilla/Logging.h"
+#include "mozilla/MediaManager.h"
 
 #undef LOG
 mozilla::LazyLogModule gMediaParentLog("MediaParent");

dom/media/systemservices/MediaSystemResourceManager.cpp

@@ -7,6 +7,7 @@
 #include "mozilla/TaskQueue.h"
 
 #include "gfxPrefs.h"
+#include "MediaSystemResourceClient.h"
 #include "MediaSystemResourceManagerChild.h"
 #include "mozilla/layers/ImageBridgeChild.h"
 

dom/media/systemservices/moz.build

@@ -12,7 +12,7 @@ if CONFIG['MOZ_WEBRTC']:
         'LoadManagerFactory.h',
         'LoadMonitor.h',
     ]
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'CamerasChild.cpp',
         'CamerasParent.cpp',
         'LoadManager.cpp',
@@ -24,6 +24,7 @@ if CONFIG['MOZ_WEBRTC']:
         '/media/webrtc/signaling',
         '/media/webrtc/trunk',
     ]
+
 if CONFIG['OS_TARGET'] == 'WINNT':
     DEFINES['WEBRTC_WIN'] = True
 else:
@@ -34,12 +35,12 @@ if CONFIG['OS_TARGET'] == 'Android':
     EXPORTS += [
         'OpenSLESProvider.h'
     ]
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'OpenSLESProvider.cpp',
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-  UNIFIED_SOURCES += ['OSXRunLoopSingleton.cpp']
+  SOURCES += ['OSXRunLoopSingleton.cpp']
   EXPORTS += ['OSXRunLoopSingleton.h']
 
 if CONFIG['_MSC_VER']:
@@ -66,7 +67,8 @@ EXPORTS.mozilla.media += ['CamerasTypes.h',
                           'MediaTaskUtils.h',
                           'MediaUtils.h',
 ]
-UNIFIED_SOURCES += [
+
+SOURCES += [
     'MediaChild.cpp',
     'MediaParent.cpp',
     'MediaSystemResourceClient.cpp',
@@ -76,11 +78,13 @@ UNIFIED_SOURCES += [
     'MediaSystemResourceService.cpp',
     'MediaUtils.cpp',
 ]
+
 IPDL_SOURCES += [
     'PCameras.ipdl',
     'PMedia.ipdl',
     'PMediaSystemResourceManager.ipdl',
 ]
+
 # /dom/base needed for nsGlobalWindow.h in MediaChild.cpp
 LOCAL_INCLUDES += [
     '/dom/base',

dom/media/wave/moz.build

@@ -9,7 +9,7 @@ EXPORTS += [
     'WaveDemuxer.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'WaveDecoder.cpp',
     'WaveDemuxer.cpp',
 ]

dom/media/webaudio/AudioContext.cpp

@@ -22,6 +22,7 @@
 #include "AudioChannelService.h"
 #include "AudioDestinationNode.h"
 #include "AudioListener.h"
+#include "AudioNodeStream.h"
 #include "AudioStream.h"
 #include "BiquadFilterNode.h"
 #include "ChannelMergerNode.h"

dom/media/webaudio/AudioDestinationNode.cpp

@@ -7,6 +7,7 @@
 #include "AudioDestinationNode.h"
 #include "AlignmentUtils.h"
 #include "AudioContext.h"
+#include "mozilla/dom/AudioContextBinding.h"
 #include "mozilla/dom/AudioDestinationNodeBinding.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/Services.h"

dom/media/webaudio/AudioEventTimeline.h

@@ -13,6 +13,7 @@
 #include "mozilla/PodOperations.h"
 
 #include "MainThreadUtils.h"
+#include "MediaStreamGraph.h"
 #include "nsTArray.h"
 #include "math.h"
 #include "WebAudioUtils.h"

dom/media/webaudio/AudioNodeEngine.cpp

@@ -14,6 +14,7 @@
 #include "AlignmentUtils.h"
 #include "AudioNodeEngineSSE2.h"
 #endif
+#include "AudioBlock.h"
 
 namespace mozilla {
 

dom/media/webaudio/AudioNodeStream.cpp

@@ -5,6 +5,7 @@
 
 #include "AudioNodeStream.h"
 
+#include "AlignmentUtils.h"
 #include "MediaStreamGraphImpl.h"
 #include "MediaStreamListener.h"
 #include "AudioNodeEngine.h"

dom/media/webaudio/ConstantSourceNode.cpp

@@ -7,6 +7,8 @@
 #include "ConstantSourceNode.h"
 
 #include "AudioDestinationNode.h"
+#include "AudioNodeEngine.h"
+#include "AudioNodeStream.h"
 #include "nsContentUtils.h"
 
 namespace mozilla {

dom/media/webaudio/DelayBuffer.h

@@ -8,6 +8,7 @@
 #define DelayBuffer_h_
 
 #include "nsTArray.h"
+#include "AudioBlock.h"
 #include "AudioSegment.h"
 #include "mozilla/dom/AudioNodeBinding.h" // for ChannelInterpretation
 

dom/media/webaudio/IIRFilterNode.cpp

@@ -5,7 +5,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "IIRFilterNode.h"
+#include "AlignmentUtils.h"
+#include "AudioBlock.h"
 #include "AudioNodeEngine.h"
+#include "AudioNodeStream.h"
+#include "AudioDestinationNode.h"
+#include "PlayingRefChangeHandler.h"
+#include "mozilla/dom/AudioDestinationNodeBinding.h"
 
 #include "blink/IIRFilter.h"
 

dom/media/webaudio/MediaBufferDecoder.cpp

@@ -16,6 +16,7 @@
 #include "DecoderTraits.h"
 #include "AudioContext.h"
 #include "AudioBuffer.h"
+#include "AudioNodeEngine.h"
 #include "nsContentUtils.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsIScriptError.h"

dom/media/webaudio/MediaStreamAudioSourceNode.cpp

@@ -9,7 +9,9 @@
 #include "AudioNodeEngine.h"
 #include "AudioNodeExternalInputStream.h"
 #include "AudioStreamTrack.h"
+#include "nsContentUtils.h"
 #include "nsIDocument.h"
+#include "nsIScriptError.h"
 #include "mozilla/CORSMode.h"
 
 namespace mozilla {

dom/media/webaudio/WebAudioUtils.cpp

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "WebAudioUtils.h"
+#include "AudioEventTimeline.h"
 #include "AudioNodeStream.h"
 #include "blink/HRTFDatabaseLoader.h"
 

dom/media/webaudio/moz.build

@@ -75,7 +75,7 @@ EXPORTS.mozilla.dom += [
     'WaveShaperNode.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'AnalyserNode.cpp',
     'AudioBlock.cpp',
     'AudioBuffer.cpp',

dom/media/webm/moz.build

@@ -11,7 +11,7 @@ EXPORTS += [
     'WebMDemuxer.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'WebMBufferedParser.cpp',
     'WebMDecoder.cpp',
     'WebMDemuxer.cpp',
@@ -19,8 +19,10 @@ UNIFIED_SOURCES += [
 
 if CONFIG['MOZ_WEBM_ENCODER']:
     EXPORTS += ['WebMWriter.h']
-    UNIFIED_SOURCES += ['EbmlComposer.cpp',
-                        'WebMWriter.cpp',
+
+    SOURCES += [
+        'EbmlComposer.cpp',
+        'WebMWriter.cpp',
     ]
 
 CXXFLAGS += CONFIG['MOZ_LIBVPX_CFLAGS']

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

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)
 

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

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>

dom/media/webrtc/PeerIdentity.h

@@ -13,6 +13,8 @@
 #include "nsStringAPI.h"
 #endif
 
+#include "mozilla/RefCounted.h"
+
 template <class T> class nsCOMPtr;
 class nsIIDNService;
 

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',
 ]
 

dom/media/webspeech/recognition/SpeechGrammarList.cpp

@@ -10,6 +10,7 @@
 #include "mozilla/ErrorResult.h"
 #include "nsCOMPtr.h"
 #include "nsXPCOMStrings.h"
+#include "SpeechGrammar.h"
 #include "SpeechRecognition.h"
 
 namespace mozilla {

dom/media/webspeech/recognition/SpeechGrammarList.h

@@ -9,6 +9,7 @@
 
 #include "mozilla/Attributes.h"
 #include "nsCOMPtr.h"
+#include "nsTArray.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 

dom/media/webspeech/recognition/SpeechRecognition.cpp

@@ -22,6 +22,7 @@
 #include "AudioSegment.h"
 #include "endpointer.h"
 
+#include "SpeechGrammar.h"
 #include "mozilla/dom/SpeechRecognitionEvent.h"
 #include "nsContentUtils.h"
 #include "nsIDocument.h"

dom/media/webspeech/recognition/moz.build

@@ -31,7 +31,7 @@ if CONFIG['MOZ_WEBSPEECH_POCKETSPHINX']:
         'PocketSphinxSpeechRecognitionService.h',
     ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'endpointer.cc',
     'energy_endpointer.cc',
     'energy_endpointer_params.cc',
@@ -45,12 +45,12 @@ UNIFIED_SOURCES += [
 ]
 
 if CONFIG['MOZ_WEBSPEECH_TEST_BACKEND']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'test/FakeSpeechRecognitionService.cpp',
     ]
 
 if CONFIG['MOZ_WEBSPEECH_POCKETSPHINX']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'PocketSphinxSpeechRecognitionService.cpp',
     ]
 

dom/media/webspeech/synth/moz.build

@@ -26,7 +26,7 @@ if CONFIG['MOZ_WEBSPEECH']:
         'SpeechSynthesisVoice.h',
     ]
 
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'ipc/SpeechSynthesisChild.cpp',
         'ipc/SpeechSynthesisParent.cpp',
         'nsSpeechTask.cpp',
@@ -37,7 +37,7 @@ if CONFIG['MOZ_WEBSPEECH']:
     ]
 
     if CONFIG['MOZ_WEBSPEECH_TEST_BACKEND']:
-        UNIFIED_SOURCES += [
+        SOURCES += [
             'test/FakeSynthModule.cpp',
             'test/nsFakeSynthServices.cpp'
         ]

dom/media/webspeech/synth/pico/moz.build

@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsPicoService.cpp',
     'PicoModule.cpp'
 ]

dom/media/webspeech/synth/speechd/moz.build

@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
   'SpeechDispatcherModule.cpp',
   'SpeechDispatcherService.cpp'
 ]

dom/media/webspeech/synth/windows/moz.build

@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
   'SapiModule.cpp',
   'SapiService.cpp'
 ]