summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-04-22 13:17:28 +0000
committerMoonchild <moonchild@palemoon.org>2020-04-22 13:17:28 +0000
commit6f37b2107aaa44a02a3c9abb015d2a65cb9bebee (patch)
tree0f8b70200fa1800ae93a8047c1218b3645c2eb53
parent2bfcaa29ac39c995af0bd5b9efcddbfdeb84be76 (diff)
downloadUXP-6f37b2107aaa44a02a3c9abb015d2a65cb9bebee.tar
UXP-6f37b2107aaa44a02a3c9abb015d2a65cb9bebee.tar.gz
UXP-6f37b2107aaa44a02a3c9abb015d2a65cb9bebee.tar.lz
UXP-6f37b2107aaa44a02a3c9abb015d2a65cb9bebee.tar.xz
UXP-6f37b2107aaa44a02a3c9abb015d2a65cb9bebee.zip
Revert "Issue #80 - De-unify dom/media part 1"
This reverts commit b5b62d841c733dcb62112f3158f1488e670671d6.
-rw-r--r--dom/media/Benchmark.cpp1
-rw-r--r--dom/media/CanvasCaptureMediaStream.cpp1
-rw-r--r--dom/media/CubebUtils.cpp2
-rwxr-xr-xdom/media/DOMMediaStream.cpp2
-rw-r--r--dom/media/MediaDecoder.cpp7
-rw-r--r--dom/media/MediaDecoderReader.cpp1
-rw-r--r--dom/media/MediaStreamListener.h1
-rw-r--r--dom/media/MediaStreamTrack.cpp4
-rw-r--r--dom/media/eme/mediadrm/moz.build2
-rw-r--r--dom/media/eme/moz.build2
-rw-r--r--dom/media/fmp4/moz.build7
-rw-r--r--dom/media/gmp/GMPDecryptorParent.cpp2
-rw-r--r--dom/media/gmp/GMPUtils.cpp2
-rw-r--r--dom/media/gmp/moz.build4
-rw-r--r--dom/media/imagecapture/CaptureTask.cpp18
-rw-r--r--dom/media/imagecapture/CaptureTask.h18
-rw-r--r--dom/media/imagecapture/moz.build2
-rw-r--r--dom/media/mediasource/TrackBuffersManager.cpp1
-rw-r--r--dom/media/mediasource/moz.build2
-rw-r--r--dom/media/moz.build8
-rw-r--r--dom/media/platforms/PlatformDecoderModule.h1
-rw-r--r--dom/media/platforms/agnostic/TheoraDecoder.cpp1
-rw-r--r--dom/media/platforms/agnostic/eme/moz.build2
-rw-r--r--dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp1
-rw-r--r--dom/media/platforms/agnostic/gmp/moz.build2
-rw-r--r--dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp1
-rw-r--r--dom/media/platforms/ffmpeg/ffmpeg57/moz.build2
-rw-r--r--dom/media/platforms/ffmpeg/ffmpeg58/moz.build2
-rw-r--r--dom/media/platforms/ffmpeg/ffvpx/moz.build2
-rw-r--r--dom/media/platforms/ffmpeg/libav53/moz.build2
-rw-r--r--dom/media/platforms/ffmpeg/libav54/moz.build2
-rw-r--r--dom/media/platforms/ffmpeg/libav55/moz.build2
-rw-r--r--dom/media/platforms/ffmpeg/moz.build2
-rw-r--r--dom/media/platforms/moz.build10
-rw-r--r--dom/media/platforms/omx/OmxPlatformLayer.cpp2
-rw-r--r--dom/media/platforms/omx/OmxPlatformLayer.h1
-rw-r--r--dom/media/platforms/omx/moz.build2
-rw-r--r--dom/media/platforms/wmf/moz.build1
-rw-r--r--dom/media/platforms/wrappers/FuzzingWrapper.cpp2
-rw-r--r--dom/media/platforms/wrappers/H264Converter.cpp2
40 files changed, 50 insertions, 79 deletions
diff --git a/dom/media/Benchmark.cpp b/dom/media/Benchmark.cpp
index e2b4abe7b..7394f8036 100644
--- a/dom/media/Benchmark.cpp
+++ b/dom/media/Benchmark.cpp
@@ -11,7 +11,6 @@
#include "PDMFactory.h"
#include "WebMDemuxer.h"
#include "mozilla/Preferences.h"
-#include "mozilla/SharedThreadPool.h"
#include "mozilla/dom/ContentChild.h"
#ifndef MOZ_WIDGET_ANDROID
diff --git a/dom/media/CanvasCaptureMediaStream.cpp b/dom/media/CanvasCaptureMediaStream.cpp
index acf2059c7..f40f01e21 100644
--- a/dom/media/CanvasCaptureMediaStream.cpp
+++ b/dom/media/CanvasCaptureMediaStream.cpp
@@ -8,7 +8,6 @@
#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"
diff --git a/dom/media/CubebUtils.cpp b/dom/media/CubebUtils.cpp
index 7f203ce62..6bb846afe 100644
--- a/dom/media/CubebUtils.cpp
+++ b/dom/media/CubebUtils.cpp
@@ -10,8 +10,6 @@
#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"
diff --git a/dom/media/DOMMediaStream.cpp b/dom/media/DOMMediaStream.cpp
index 53d096d6e..118d845a3 100755
--- a/dom/media/DOMMediaStream.cpp
+++ b/dom/media/DOMMediaStream.cpp
@@ -14,7 +14,6 @@
#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"
@@ -23,7 +22,6 @@
#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"
diff --git a/dom/media/MediaDecoder.cpp b/dom/media/MediaDecoder.cpp
index b1f2f95d7..0cce91ccb 100644
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -788,13 +788,6 @@ 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()
{
diff --git a/dom/media/MediaDecoderReader.cpp b/dom/media/MediaDecoderReader.cpp
index 046f81b2e..b6cdf9080 100644
--- a/dom/media/MediaDecoderReader.cpp
+++ b/dom/media/MediaDecoderReader.cpp
@@ -14,7 +14,6 @@
#include "nsPrintfCString.h"
#include "mozilla/mozalloc.h"
#include "mozilla/Mutex.h"
-#include "mozilla/SharedThreadPool.h"
#include <stdint.h>
#include <algorithm>
diff --git a/dom/media/MediaStreamListener.h b/dom/media/MediaStreamListener.h
index a0563d9b8..2b6be85cf 100644
--- a/dom/media/MediaStreamListener.h
+++ b/dom/media/MediaStreamListener.h
@@ -7,7 +7,6 @@
#ifndef MOZILLA_MEDIASTREAMLISTENER_h_
#define MOZILLA_MEDIASTREAMLISTENER_h_
-#include "MediaStreamGraph.h"
#include "StreamTracks.h"
namespace mozilla {
diff --git a/dom/media/MediaStreamTrack.cpp b/dom/media/MediaStreamTrack.cpp
index 648ec82a0..75cdeb1d1 100644
--- a/dom/media/MediaStreamTrack.cpp
+++ b/dom/media/MediaStreamTrack.cpp
@@ -7,10 +7,8 @@
#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"
@@ -23,8 +21,6 @@
static mozilla::LazyLogModule gMediaStreamTrackLog("MediaStreamTrack");
#define LOG(type, msg) MOZ_LOG(gMediaStreamTrackLog, type, msg)
-using namespace mozilla::media;
-
namespace mozilla {
namespace dom {
diff --git a/dom/media/eme/mediadrm/moz.build b/dom/media/eme/mediadrm/moz.build
index 83479d670..c01f7a52e 100644
--- a/dom/media/eme/mediadrm/moz.build
+++ b/dom/media/eme/mediadrm/moz.build
@@ -10,7 +10,7 @@ EXPORTS.mozilla += [
'MediaDrmProxySupport.h',
]
-SOURCES += [
+UNIFIED_SOURCES += [
'MediaDrmCDMCallbackProxy.cpp',
'MediaDrmCDMProxy.cpp',
'MediaDrmProxySupport.cpp',
diff --git a/dom/media/eme/moz.build b/dom/media/eme/moz.build
index b55ae3df5..47e622ae3 100644
--- a/dom/media/eme/moz.build
+++ b/dom/media/eme/moz.build
@@ -23,7 +23,7 @@ EXPORTS.mozilla += [
'EMEUtils.h',
]
-SOURCES += [
+UNIFIED_SOURCES += [
'CDMCaps.cpp',
'DetailedPromise.cpp',
'EMEUtils.cpp',
diff --git a/dom/media/fmp4/moz.build b/dom/media/fmp4/moz.build
index 535a99253..a79fb0229 100644
--- a/dom/media/fmp4/moz.build
+++ b/dom/media/fmp4/moz.build
@@ -10,10 +10,13 @@ EXPORTS += [
'MP4Stream.h',
]
-SOURCES += [
+UNIFIED_SOURCES += [
'MP4Decoder.cpp',
- 'MP4Demuxer.cpp',
'MP4Stream.cpp',
]
+SOURCES += [
+ 'MP4Demuxer.cpp',
+]
+
FINAL_LIBRARY = 'xul'
diff --git a/dom/media/gmp/GMPDecryptorParent.cpp b/dom/media/gmp/GMPDecryptorParent.cpp
index 56474e973..4f5402160 100644
--- a/dom/media/gmp/GMPDecryptorParent.cpp
+++ b/dom/media/gmp/GMPDecryptorParent.cpp
@@ -4,9 +4,7 @@
* 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"
diff --git a/dom/media/gmp/GMPUtils.cpp b/dom/media/gmp/GMPUtils.cpp
index 6c2147ae2..d27523760 100644
--- a/dom/media/gmp/GMPUtils.cpp
+++ b/dom/media/gmp/GMPUtils.cpp
@@ -10,10 +10,8 @@
#include "nsCOMPtr.h"
#include "nsLiteralString.h"
#include "nsCRTGlue.h"
-#include "mozIGeckoMediaPluginService.h"
#include "mozilla/Base64.h"
#include "nsISimpleEnumerator.h"
-#include "prio.h"
namespace mozilla {
diff --git a/dom/media/gmp/moz.build b/dom/media/gmp/moz.build
index 8595ee0de..79de6e1d9 100644
--- a/dom/media/gmp/moz.build
+++ b/dom/media/gmp/moz.build
@@ -87,7 +87,7 @@ if CONFIG['OS_TARGET'] == 'Android':
'rlz',
]
-SOURCES += [
+UNIFIED_SOURCES += [
'GMPAudioDecoderChild.cpp',
'GMPAudioDecoderParent.cpp',
'GMPAudioHost.cpp',
@@ -123,7 +123,7 @@ SOURCES += [
]
if CONFIG['MOZ_EME']:
- SOURCES += [
+ UNIFIED_SOURCES += [
'GMPCDMCallbackProxy.cpp',
'GMPCDMProxy.cpp',
]
diff --git a/dom/media/imagecapture/CaptureTask.cpp b/dom/media/imagecapture/CaptureTask.cpp
index 9f1eea9ef..589ba5a42 100644
--- a/dom/media/imagecapture/CaptureTask.cpp
+++ b/dom/media/imagecapture/CaptureTask.cpp
@@ -15,6 +15,24 @@
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))
diff --git a/dom/media/imagecapture/CaptureTask.h b/dom/media/imagecapture/CaptureTask.h
index f9c810158..2b4f0a04c 100644
--- a/dom/media/imagecapture/CaptureTask.h
+++ b/dom/media/imagecapture/CaptureTask.h
@@ -86,24 +86,6 @@ 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
diff --git a/dom/media/imagecapture/moz.build b/dom/media/imagecapture/moz.build
index c1a58ff37..f47649c5e 100644
--- a/dom/media/imagecapture/moz.build
+++ b/dom/media/imagecapture/moz.build
@@ -8,7 +8,7 @@ EXPORTS.mozilla.dom += [
'ImageCapture.h'
]
-SOURCES += [
+UNIFIED_SOURCES += [
'CaptureTask.cpp',
'ImageCapture.cpp',
]
diff --git a/dom/media/mediasource/TrackBuffersManager.cpp b/dom/media/mediasource/TrackBuffersManager.cpp
index b9cf19492..9a2d00ad8 100644
--- a/dom/media/mediasource/TrackBuffersManager.cpp
+++ b/dom/media/mediasource/TrackBuffersManager.cpp
@@ -40,7 +40,6 @@ using media::TimeUnit;
using media::TimeInterval;
using media::TimeIntervals;
typedef SourceBufferTask::AppendBufferResult AppendBufferResult;
-typedef SourceBufferAttributes::AppendState AppendState;
static const char*
AppendStateToStr(SourceBufferAttributes::AppendState aState)
diff --git a/dom/media/mediasource/moz.build b/dom/media/mediasource/moz.build
index dfa227a86..a1689c216 100644
--- a/dom/media/mediasource/moz.build
+++ b/dom/media/mediasource/moz.build
@@ -21,7 +21,7 @@ EXPORTS.mozilla.dom += [
'SourceBufferList.h',
]
-SOURCES += [
+UNIFIED_SOURCES += [
'ContainerParser.cpp',
'MediaSource.cpp',
'MediaSourceDecoder.cpp',
diff --git a/dom/media/moz.build b/dom/media/moz.build
index 4cb514a08..41267a6ef 100644
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -184,7 +184,7 @@ EXPORTS.mozilla.dom += [
'VideoTrackList.h',
]
-SOURCES += [
+UNIFIED_SOURCES += [
'AccurateSeekTask.cpp',
'ADTSDecoder.cpp',
'ADTSDemuxer.cpp',
@@ -201,7 +201,6 @@ SOURCES += [
'CanvasCaptureMediaStream.cpp',
'CubebUtils.cpp',
'DecoderDoctorDiagnostics.cpp',
- 'DecoderTraits.cpp',
'DOMMediaStream.cpp',
'EncodedBufferCache.cpp',
'FileBlockCache.cpp',
@@ -257,6 +256,11 @@ 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']:
diff --git a/dom/media/platforms/PlatformDecoderModule.h b/dom/media/platforms/PlatformDecoderModule.h
index 39e2b8ea1..7480d8ff9 100644
--- a/dom/media/platforms/PlatformDecoderModule.h
+++ b/dom/media/platforms/PlatformDecoderModule.h
@@ -7,7 +7,6 @@
#if !defined(PlatformDecoderModule_h_)
#define PlatformDecoderModule_h_
-#include "ImageContainer.h"
#include "MediaDecoderReader.h"
#include "MediaInfo.h"
#include "mozilla/MozPromise.h"
diff --git a/dom/media/platforms/agnostic/TheoraDecoder.cpp b/dom/media/platforms/agnostic/TheoraDecoder.cpp
index 695e697d7..b216791e4 100644
--- a/dom/media/platforms/agnostic/TheoraDecoder.cpp
+++ b/dom/media/platforms/agnostic/TheoraDecoder.cpp
@@ -10,7 +10,6 @@
#include "nsError.h"
#include "TimeUnits.h"
#include "mozilla/PodOperations.h"
-#include "mozilla/SyncRunnable.h"
#include <algorithm>
diff --git a/dom/media/platforms/agnostic/eme/moz.build b/dom/media/platforms/agnostic/eme/moz.build
index e48d49d80..78b76d4d4 100644
--- a/dom/media/platforms/agnostic/eme/moz.build
+++ b/dom/media/platforms/agnostic/eme/moz.build
@@ -11,7 +11,7 @@ EXPORTS += [
'SamplesWaitingForKey.h',
]
-SOURCES += [
+UNIFIED_SOURCES += [
'EMEAudioDecoder.cpp',
'EMEDecoderModule.cpp',
'EMEVideoDecoder.cpp',
diff --git a/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp b/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
index 26d029da0..912b88ce1 100644
--- a/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
+++ b/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
@@ -10,7 +10,6 @@
#include "prsystem.h"
#include "MediaData.h"
#include "GMPDecoderModule.h"
-#include "MP4Decoder.h"
#include "VPXDecoder.h"
namespace mozilla {
diff --git a/dom/media/platforms/agnostic/gmp/moz.build b/dom/media/platforms/agnostic/gmp/moz.build
index 644df47a3..eb2738e26 100644
--- a/dom/media/platforms/agnostic/gmp/moz.build
+++ b/dom/media/platforms/agnostic/gmp/moz.build
@@ -11,7 +11,7 @@ EXPORTS += [
'MediaDataDecoderProxy.h',
]
-SOURCES += [
+UNIFIED_SOURCES += [
'GMPAudioDecoder.cpp',
'GMPDecoderModule.cpp',
'GMPVideoDecoder.cpp',
diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
index f9e8a2d26..f3101e44c 100644
--- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
+++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
@@ -16,7 +16,6 @@
#include "FFmpegVideoDecoder.h"
#include "FFmpegLog.h"
#include "mozilla/PodOperations.h"
-#include "prsystem.h" // for PR_GetNumberOfProcessors
#include "libavutil/pixfmt.h"
#if LIBAVCODEC_VERSION_MAJOR < 54
diff --git a/dom/media/platforms/ffmpeg/ffmpeg57/moz.build b/dom/media/platforms/ffmpeg/ffmpeg57/moz.build
index 7a55d7685..6bd5db8d7 100644
--- a/dom/media/platforms/ffmpeg/ffmpeg57/moz.build
+++ b/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/.
-SOURCES += [
+UNIFIED_SOURCES += [
'../FFmpegAudioDecoder.cpp',
'../FFmpegDataDecoder.cpp',
'../FFmpegDecoderModule.cpp',
diff --git a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
index 7a55d7685..6bd5db8d7 100644
--- a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
+++ b/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/.
-SOURCES += [
+UNIFIED_SOURCES += [
'../FFmpegAudioDecoder.cpp',
'../FFmpegDataDecoder.cpp',
'../FFmpegDecoderModule.cpp',
diff --git a/dom/media/platforms/ffmpeg/ffvpx/moz.build b/dom/media/platforms/ffmpeg/ffvpx/moz.build
index 95f8eec65..c0041a4d4 100644
--- a/dom/media/platforms/ffmpeg/ffvpx/moz.build
+++ b/dom/media/platforms/ffmpeg/ffvpx/moz.build
@@ -9,7 +9,7 @@ EXPORTS += [
'FFVPXRuntimeLinker.h',
]
-SOURCES += [
+UNIFIED_SOURCES += [
'../FFmpegAudioDecoder.cpp',
'../FFmpegDataDecoder.cpp',
'../FFmpegDecoderModule.cpp',
diff --git a/dom/media/platforms/ffmpeg/libav53/moz.build b/dom/media/platforms/ffmpeg/libav53/moz.build
index 471edd701..2bdc1dc34 100644
--- a/dom/media/platforms/ffmpeg/libav53/moz.build
+++ b/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/.
-SOURCES += [
+UNIFIED_SOURCES += [
'../FFmpegAudioDecoder.cpp',
'../FFmpegDataDecoder.cpp',
'../FFmpegDecoderModule.cpp',
diff --git a/dom/media/platforms/ffmpeg/libav54/moz.build b/dom/media/platforms/ffmpeg/libav54/moz.build
index 471edd701..2bdc1dc34 100644
--- a/dom/media/platforms/ffmpeg/libav54/moz.build
+++ b/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/.
-SOURCES += [
+UNIFIED_SOURCES += [
'../FFmpegAudioDecoder.cpp',
'../FFmpegDataDecoder.cpp',
'../FFmpegDecoderModule.cpp',
diff --git a/dom/media/platforms/ffmpeg/libav55/moz.build b/dom/media/platforms/ffmpeg/libav55/moz.build
index 7a55d7685..6bd5db8d7 100644
--- a/dom/media/platforms/ffmpeg/libav55/moz.build
+++ b/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/.
-SOURCES += [
+UNIFIED_SOURCES += [
'../FFmpegAudioDecoder.cpp',
'../FFmpegDataDecoder.cpp',
'../FFmpegDecoderModule.cpp',
diff --git a/dom/media/platforms/ffmpeg/moz.build b/dom/media/platforms/ffmpeg/moz.build
index e42a8aa4d..af96fb521 100644
--- a/dom/media/platforms/ffmpeg/moz.build
+++ b/dom/media/platforms/ffmpeg/moz.build
@@ -16,7 +16,7 @@ DIRS += [
'ffmpeg58',
]
-SOURCES += [
+UNIFIED_SOURCES += [
'FFmpegRuntimeLinker.cpp',
]
diff --git a/dom/media/platforms/moz.build b/dom/media/platforms/moz.build
index 23bea20dd..c46d52e3f 100644
--- a/dom/media/platforms/moz.build
+++ b/dom/media/platforms/moz.build
@@ -16,7 +16,7 @@ EXPORTS += [
'wrappers/H264Converter.h'
]
-SOURCES += [
+UNIFIED_SOURCES += [
'agnostic/AgnosticDecoderModule.cpp',
'agnostic/BlankDecoderModule.cpp',
'agnostic/OpusDecoder.cpp',
@@ -42,7 +42,7 @@ if CONFIG['MOZ_WMF']:
if CONFIG['MOZ_FFVPX'] or CONFIG['MOZ_FFMPEG']:
# common code to either FFmpeg or FFVPX
- SOURCES += [
+ UNIFIED_SOURCES += [
'ffmpeg/FFmpegLibWrapper.cpp',
]
@@ -60,7 +60,7 @@ if CONFIG['MOZ_AV1']:
EXPORTS += [
'agnostic/AOMDecoder.h',
]
- SOURCES += [
+ UNIFIED_SOURCES += [
'agnostic/AOMDecoder.cpp',
]
@@ -68,7 +68,7 @@ if CONFIG['MOZ_APPLEMEDIA']:
EXPORTS += [
'apple/AppleDecoderModule.h',
]
- SOURCES += [
+ UNIFIED_SOURCES += [
'apple/AppleATDecoder.cpp',
'apple/AppleCMLinker.cpp',
'apple/AppleDecoderModule.cpp',
@@ -85,7 +85,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
EXPORTS += [
'android/AndroidDecoderModule.h',
]
- SOURCES += [
+ UNIFIED_SOURCES += [
'android/AndroidDecoderModule.cpp',
'android/MediaCodecDataDecoder.cpp',
'android/RemoteDataDecoder.cpp',
diff --git a/dom/media/platforms/omx/OmxPlatformLayer.cpp b/dom/media/platforms/omx/OmxPlatformLayer.cpp
index 12a7d0595..15b3062a4 100644
--- a/dom/media/platforms/omx/OmxPlatformLayer.cpp
+++ b/dom/media/platforms/omx/OmxPlatformLayer.cpp
@@ -6,8 +6,6 @@
#include "OmxPlatformLayer.h"
-#include "OmxDataDecoder.h"
-
#include "OMX_VideoExt.h" // For VP8.
#include "VPXDecoder.h"
diff --git a/dom/media/platforms/omx/OmxPlatformLayer.h b/dom/media/platforms/omx/OmxPlatformLayer.h
index 8e751e1a7..67d9e448f 100644
--- a/dom/media/platforms/omx/OmxPlatformLayer.h
+++ b/dom/media/platforms/omx/OmxPlatformLayer.h
@@ -7,7 +7,6 @@
#if !defined(OmxPlatformLayer_h_)
#define OmxPlatformLayer_h_
-#include "OMX_Component.h"
#include "OMX_Core.h"
#include "OMX_Types.h"
diff --git a/dom/media/platforms/omx/moz.build b/dom/media/platforms/omx/moz.build
index ee7202bd3..661e280e0 100644
--- a/dom/media/platforms/omx/moz.build
+++ b/dom/media/platforms/omx/moz.build
@@ -8,7 +8,7 @@ EXPORTS += [
'OmxDecoderModule.h',
]
-SOURCES += [
+UNIFIED_SOURCES += [
'OmxDataDecoder.cpp',
'OmxDecoderModule.cpp',
'OmxPlatformLayer.cpp',
diff --git a/dom/media/platforms/wmf/moz.build b/dom/media/platforms/wmf/moz.build
index 83c2249e1..fa966bea2 100644
--- a/dom/media/platforms/wmf/moz.build
+++ b/dom/media/platforms/wmf/moz.build
@@ -14,7 +14,6 @@ EXPORTS += [
'WMFUtils.h',
'WMFVideoMFTManager.h',
]
-
UNIFIED_SOURCES += [
'DXVA2Manager.cpp',
'MFTDecoder.cpp',
diff --git a/dom/media/platforms/wrappers/FuzzingWrapper.cpp b/dom/media/platforms/wrappers/FuzzingWrapper.cpp
index e8b451cc8..7df020f46 100644
--- a/dom/media/platforms/wrappers/FuzzingWrapper.cpp
+++ b/dom/media/platforms/wrappers/FuzzingWrapper.cpp
@@ -6,8 +6,6 @@
#include "FuzzingWrapper.h"
-#include "mozilla/SharedThreadPool.h"
-
mozilla::LogModule* GetFuzzingWrapperLog() {
static mozilla::LazyLogModule log("MediaFuzzingWrapper");
return log;
diff --git a/dom/media/platforms/wrappers/H264Converter.cpp b/dom/media/platforms/wrappers/H264Converter.cpp
index cca03fceb..0edbfc10c 100644
--- a/dom/media/platforms/wrappers/H264Converter.cpp
+++ b/dom/media/platforms/wrappers/H264Converter.cpp
@@ -6,11 +6,9 @@
#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"