From 2bfcaa29ac39c995af0bd5b9efcddbfdeb84be76 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Wed, 22 Apr 2020 11:13:13 +0000 Subject: Issue #80 - De-unify dom/media part 2 --- dom/media/standalone/moz.build | 2 +- dom/media/systemservices/MediaParent.cpp | 1 + dom/media/systemservices/MediaSystemResourceManager.cpp | 1 + dom/media/systemservices/moz.build | 12 ++++++++---- 4 files changed, 11 insertions(+), 5 deletions(-) (limited to 'dom/media') diff --git a/dom/media/standalone/moz.build b/dom/media/standalone/moz.build index 959703765..a3cc3545f 100644 --- a/dom/media/standalone/moz.build +++ b/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', diff --git a/dom/media/systemservices/MediaParent.cpp b/dom/media/systemservices/MediaParent.cpp index 89a495f6a..16c399f37 100644 --- a/dom/media/systemservices/MediaParent.cpp +++ b/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"); diff --git a/dom/media/systemservices/MediaSystemResourceManager.cpp b/dom/media/systemservices/MediaSystemResourceManager.cpp index 29db0ef3e..a66e946eb 100644 --- a/dom/media/systemservices/MediaSystemResourceManager.cpp +++ b/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" diff --git a/dom/media/systemservices/moz.build b/dom/media/systemservices/moz.build index 82a5c5e72..c582b7ba1 100644 --- a/dom/media/systemservices/moz.build +++ b/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', -- cgit v1.2.3 From 6f37b2107aaa44a02a3c9abb015d2a65cb9bebee Mon Sep 17 00:00:00 2001 From: Moonchild Date: Wed, 22 Apr 2020 13:17:28 +0000 Subject: Revert "Issue #80 - De-unify dom/media part 1" This reverts commit b5b62d841c733dcb62112f3158f1488e670671d6. --- dom/media/Benchmark.cpp | 1 - dom/media/CanvasCaptureMediaStream.cpp | 1 - dom/media/CubebUtils.cpp | 2 -- dom/media/DOMMediaStream.cpp | 2 -- dom/media/MediaDecoder.cpp | 7 ------- dom/media/MediaDecoderReader.cpp | 1 - dom/media/MediaStreamListener.h | 1 - dom/media/MediaStreamTrack.cpp | 4 ---- dom/media/eme/mediadrm/moz.build | 2 +- dom/media/eme/moz.build | 2 +- dom/media/fmp4/moz.build | 7 +++++-- dom/media/gmp/GMPDecryptorParent.cpp | 2 -- dom/media/gmp/GMPUtils.cpp | 2 -- dom/media/gmp/moz.build | 4 ++-- dom/media/imagecapture/CaptureTask.cpp | 18 ++++++++++++++++++ dom/media/imagecapture/CaptureTask.h | 18 ------------------ dom/media/imagecapture/moz.build | 2 +- dom/media/mediasource/TrackBuffersManager.cpp | 1 - dom/media/mediasource/moz.build | 2 +- dom/media/moz.build | 8 ++++++-- dom/media/platforms/PlatformDecoderModule.h | 1 - dom/media/platforms/agnostic/TheoraDecoder.cpp | 1 - dom/media/platforms/agnostic/eme/moz.build | 2 +- dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp | 1 - dom/media/platforms/agnostic/gmp/moz.build | 2 +- dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp | 1 - dom/media/platforms/ffmpeg/ffmpeg57/moz.build | 2 +- dom/media/platforms/ffmpeg/ffmpeg58/moz.build | 2 +- dom/media/platforms/ffmpeg/ffvpx/moz.build | 2 +- dom/media/platforms/ffmpeg/libav53/moz.build | 2 +- dom/media/platforms/ffmpeg/libav54/moz.build | 2 +- dom/media/platforms/ffmpeg/libav55/moz.build | 2 +- dom/media/platforms/ffmpeg/moz.build | 2 +- dom/media/platforms/moz.build | 10 +++++----- dom/media/platforms/omx/OmxPlatformLayer.cpp | 2 -- dom/media/platforms/omx/OmxPlatformLayer.h | 1 - dom/media/platforms/omx/moz.build | 2 +- dom/media/platforms/wmf/moz.build | 1 - dom/media/platforms/wrappers/FuzzingWrapper.cpp | 2 -- dom/media/platforms/wrappers/H264Converter.cpp | 2 -- 40 files changed, 50 insertions(+), 79 deletions(-) (limited to 'dom/media') 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 #include 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 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" -- cgit v1.2.3 From 347f3bae7319cf7be6556cefae219b5fbe326ec8 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Wed, 22 Apr 2020 02:32:20 +0000 Subject: Issue #80 - De-unify dom/media part 1 (updated reland) This de-unifies up to and including dom/media/platforms with the exception of dom/media/platforms/wmf, because that one throws weird errors in the Win SDK which don't have a clear cause (yet) --- dom/media/Benchmark.cpp | 1 + dom/media/CanvasCaptureMediaStream.cpp | 1 + dom/media/CubebUtils.cpp | 2 ++ dom/media/DOMMediaStream.cpp | 2 ++ dom/media/MediaDecoder.cpp | 7 +++++++ dom/media/MediaDecoderReader.cpp | 1 + dom/media/MediaStreamListener.h | 1 + dom/media/MediaStreamTrack.cpp | 4 ++++ dom/media/eme/MediaKeySystemAccess.cpp | 2 ++ dom/media/eme/mediadrm/moz.build | 2 +- dom/media/eme/moz.build | 2 +- dom/media/fmp4/moz.build | 7 ++----- dom/media/gmp/GMPDecryptorParent.cpp | 2 ++ dom/media/gmp/GMPUtils.cpp | 2 ++ dom/media/gmp/moz.build | 4 ++-- dom/media/imagecapture/CaptureTask.cpp | 18 ------------------ dom/media/imagecapture/CaptureTask.h | 18 ++++++++++++++++++ dom/media/imagecapture/moz.build | 2 +- dom/media/mediasource/TrackBuffersManager.cpp | 1 + dom/media/mediasource/moz.build | 2 +- dom/media/moz.build | 8 ++------ dom/media/platforms/PlatformDecoderModule.h | 1 + dom/media/platforms/agnostic/TheoraDecoder.cpp | 1 + dom/media/platforms/agnostic/eme/moz.build | 2 +- dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp | 1 + dom/media/platforms/agnostic/gmp/moz.build | 2 +- dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp | 1 + dom/media/platforms/ffmpeg/ffmpeg57/moz.build | 2 +- dom/media/platforms/ffmpeg/ffmpeg58/moz.build | 2 +- dom/media/platforms/ffmpeg/ffvpx/moz.build | 2 +- dom/media/platforms/ffmpeg/libav53/moz.build | 2 +- dom/media/platforms/ffmpeg/libav54/moz.build | 2 +- dom/media/platforms/ffmpeg/libav55/moz.build | 2 +- dom/media/platforms/ffmpeg/moz.build | 2 +- dom/media/platforms/moz.build | 10 +++++----- dom/media/platforms/omx/OmxPlatformLayer.cpp | 2 ++ dom/media/platforms/omx/OmxPlatformLayer.h | 1 + dom/media/platforms/omx/moz.build | 2 +- dom/media/platforms/wmf/moz.build | 1 + dom/media/platforms/wrappers/FuzzingWrapper.cpp | 2 ++ dom/media/platforms/wrappers/H264Converter.cpp | 2 ++ 41 files changed, 81 insertions(+), 50 deletions(-) (limited to 'dom/media') diff --git a/dom/media/Benchmark.cpp b/dom/media/Benchmark.cpp index 7394f8036..e2b4abe7b 100644 --- a/dom/media/Benchmark.cpp +++ b/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 diff --git a/dom/media/CanvasCaptureMediaStream.cpp b/dom/media/CanvasCaptureMediaStream.cpp index f40f01e21..acf2059c7 100644 --- a/dom/media/CanvasCaptureMediaStream.cpp +++ b/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" diff --git a/dom/media/CubebUtils.cpp b/dom/media/CubebUtils.cpp index 6bb846afe..7f203ce62 100644 --- a/dom/media/CubebUtils.cpp +++ b/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" diff --git a/dom/media/DOMMediaStream.cpp b/dom/media/DOMMediaStream.cpp index 118d845a3..53d096d6e 100755 --- a/dom/media/DOMMediaStream.cpp +++ b/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" diff --git a/dom/media/MediaDecoder.cpp b/dom/media/MediaDecoder.cpp index 0cce91ccb..b1f2f95d7 100644 --- a/dom/media/MediaDecoder.cpp +++ b/dom/media/MediaDecoder.cpp @@ -788,6 +788,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() { diff --git a/dom/media/MediaDecoderReader.cpp b/dom/media/MediaDecoderReader.cpp index b6cdf9080..046f81b2e 100644 --- a/dom/media/MediaDecoderReader.cpp +++ b/dom/media/MediaDecoderReader.cpp @@ -14,6 +14,7 @@ #include "nsPrintfCString.h" #include "mozilla/mozalloc.h" #include "mozilla/Mutex.h" +#include "mozilla/SharedThreadPool.h" #include #include diff --git a/dom/media/MediaStreamListener.h b/dom/media/MediaStreamListener.h index 2b6be85cf..a0563d9b8 100644 --- a/dom/media/MediaStreamListener.h +++ b/dom/media/MediaStreamListener.h @@ -7,6 +7,7 @@ #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 75cdeb1d1..648ec82a0 100644 --- a/dom/media/MediaStreamTrack.cpp +++ b/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 { diff --git a/dom/media/eme/MediaKeySystemAccess.cpp b/dom/media/eme/MediaKeySystemAccess.cpp index 4a5a7a30c..e4e86f4c5 100644 --- a/dom/media/eme/MediaKeySystemAccess.cpp +++ b/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 { diff --git a/dom/media/eme/mediadrm/moz.build b/dom/media/eme/mediadrm/moz.build index c01f7a52e..83479d670 100644 --- a/dom/media/eme/mediadrm/moz.build +++ b/dom/media/eme/mediadrm/moz.build @@ -10,7 +10,7 @@ EXPORTS.mozilla += [ 'MediaDrmProxySupport.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'MediaDrmCDMCallbackProxy.cpp', 'MediaDrmCDMProxy.cpp', 'MediaDrmProxySupport.cpp', diff --git a/dom/media/eme/moz.build b/dom/media/eme/moz.build index 47e622ae3..b55ae3df5 100644 --- a/dom/media/eme/moz.build +++ b/dom/media/eme/moz.build @@ -23,7 +23,7 @@ EXPORTS.mozilla += [ 'EMEUtils.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'CDMCaps.cpp', 'DetailedPromise.cpp', 'EMEUtils.cpp', diff --git a/dom/media/fmp4/moz.build b/dom/media/fmp4/moz.build index a79fb0229..535a99253 100644 --- a/dom/media/fmp4/moz.build +++ b/dom/media/fmp4/moz.build @@ -10,13 +10,10 @@ EXPORTS += [ 'MP4Stream.h', ] -UNIFIED_SOURCES += [ - 'MP4Decoder.cpp', - 'MP4Stream.cpp', -] - SOURCES += [ + 'MP4Decoder.cpp', 'MP4Demuxer.cpp', + 'MP4Stream.cpp', ] FINAL_LIBRARY = 'xul' diff --git a/dom/media/gmp/GMPDecryptorParent.cpp b/dom/media/gmp/GMPDecryptorParent.cpp index 4f5402160..56474e973 100644 --- a/dom/media/gmp/GMPDecryptorParent.cpp +++ b/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" diff --git a/dom/media/gmp/GMPUtils.cpp b/dom/media/gmp/GMPUtils.cpp index d27523760..6c2147ae2 100644 --- a/dom/media/gmp/GMPUtils.cpp +++ b/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 { diff --git a/dom/media/gmp/moz.build b/dom/media/gmp/moz.build index 79de6e1d9..8595ee0de 100644 --- a/dom/media/gmp/moz.build +++ b/dom/media/gmp/moz.build @@ -87,7 +87,7 @@ if CONFIG['OS_TARGET'] == 'Android': 'rlz', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'GMPAudioDecoderChild.cpp', 'GMPAudioDecoderParent.cpp', 'GMPAudioHost.cpp', @@ -123,7 +123,7 @@ UNIFIED_SOURCES += [ ] if CONFIG['MOZ_EME']: - UNIFIED_SOURCES += [ + SOURCES += [ 'GMPCDMCallbackProxy.cpp', 'GMPCDMProxy.cpp', ] diff --git a/dom/media/imagecapture/CaptureTask.cpp b/dom/media/imagecapture/CaptureTask.cpp index 589ba5a42..9f1eea9ef 100644 --- a/dom/media/imagecapture/CaptureTask.cpp +++ b/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)) diff --git a/dom/media/imagecapture/CaptureTask.h b/dom/media/imagecapture/CaptureTask.h index 2b4f0a04c..f9c810158 100644 --- a/dom/media/imagecapture/CaptureTask.h +++ b/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 diff --git a/dom/media/imagecapture/moz.build b/dom/media/imagecapture/moz.build index f47649c5e..c1a58ff37 100644 --- a/dom/media/imagecapture/moz.build +++ b/dom/media/imagecapture/moz.build @@ -8,7 +8,7 @@ EXPORTS.mozilla.dom += [ 'ImageCapture.h' ] -UNIFIED_SOURCES += [ +SOURCES += [ 'CaptureTask.cpp', 'ImageCapture.cpp', ] diff --git a/dom/media/mediasource/TrackBuffersManager.cpp b/dom/media/mediasource/TrackBuffersManager.cpp index 9a2d00ad8..b9cf19492 100644 --- a/dom/media/mediasource/TrackBuffersManager.cpp +++ b/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) diff --git a/dom/media/mediasource/moz.build b/dom/media/mediasource/moz.build index a1689c216..dfa227a86 100644 --- a/dom/media/mediasource/moz.build +++ b/dom/media/mediasource/moz.build @@ -21,7 +21,7 @@ EXPORTS.mozilla.dom += [ 'SourceBufferList.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'ContainerParser.cpp', 'MediaSource.cpp', 'MediaSourceDecoder.cpp', diff --git a/dom/media/moz.build b/dom/media/moz.build index 41267a6ef..4cb514a08 100644 --- a/dom/media/moz.build +++ b/dom/media/moz.build @@ -184,7 +184,7 @@ EXPORTS.mozilla.dom += [ 'VideoTrackList.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'AccurateSeekTask.cpp', 'ADTSDecoder.cpp', 'ADTSDemuxer.cpp', @@ -201,6 +201,7 @@ UNIFIED_SOURCES += [ 'CanvasCaptureMediaStream.cpp', 'CubebUtils.cpp', 'DecoderDoctorDiagnostics.cpp', + 'DecoderTraits.cpp', 'DOMMediaStream.cpp', 'EncodedBufferCache.cpp', 'FileBlockCache.cpp', @@ -256,11 +257,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']: diff --git a/dom/media/platforms/PlatformDecoderModule.h b/dom/media/platforms/PlatformDecoderModule.h index 7480d8ff9..39e2b8ea1 100644 --- a/dom/media/platforms/PlatformDecoderModule.h +++ b/dom/media/platforms/PlatformDecoderModule.h @@ -7,6 +7,7 @@ #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 b216791e4..695e697d7 100644 --- a/dom/media/platforms/agnostic/TheoraDecoder.cpp +++ b/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 diff --git a/dom/media/platforms/agnostic/eme/moz.build b/dom/media/platforms/agnostic/eme/moz.build index 78b76d4d4..e48d49d80 100644 --- a/dom/media/platforms/agnostic/eme/moz.build +++ b/dom/media/platforms/agnostic/eme/moz.build @@ -11,7 +11,7 @@ EXPORTS += [ 'SamplesWaitingForKey.h', ] -UNIFIED_SOURCES += [ +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 912b88ce1..26d029da0 100644 --- a/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp +++ b/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 { diff --git a/dom/media/platforms/agnostic/gmp/moz.build b/dom/media/platforms/agnostic/gmp/moz.build index eb2738e26..644df47a3 100644 --- a/dom/media/platforms/agnostic/gmp/moz.build +++ b/dom/media/platforms/agnostic/gmp/moz.build @@ -11,7 +11,7 @@ EXPORTS += [ 'MediaDataDecoderProxy.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'GMPAudioDecoder.cpp', 'GMPDecoderModule.cpp', 'GMPVideoDecoder.cpp', diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp index f3101e44c..f9e8a2d26 100644 --- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp +++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp @@ -16,6 +16,7 @@ #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 6bd5db8d7..7a55d7685 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/. -UNIFIED_SOURCES += [ +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 6bd5db8d7..7a55d7685 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/. -UNIFIED_SOURCES += [ +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 c0041a4d4..95f8eec65 100644 --- a/dom/media/platforms/ffmpeg/ffvpx/moz.build +++ b/dom/media/platforms/ffmpeg/ffvpx/moz.build @@ -9,7 +9,7 @@ EXPORTS += [ 'FFVPXRuntimeLinker.h', ] -UNIFIED_SOURCES += [ +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 2bdc1dc34..471edd701 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/. -UNIFIED_SOURCES += [ +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 2bdc1dc34..471edd701 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/. -UNIFIED_SOURCES += [ +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 6bd5db8d7..7a55d7685 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/. -UNIFIED_SOURCES += [ +SOURCES += [ '../FFmpegAudioDecoder.cpp', '../FFmpegDataDecoder.cpp', '../FFmpegDecoderModule.cpp', diff --git a/dom/media/platforms/ffmpeg/moz.build b/dom/media/platforms/ffmpeg/moz.build index af96fb521..e42a8aa4d 100644 --- a/dom/media/platforms/ffmpeg/moz.build +++ b/dom/media/platforms/ffmpeg/moz.build @@ -16,7 +16,7 @@ DIRS += [ 'ffmpeg58', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'FFmpegRuntimeLinker.cpp', ] diff --git a/dom/media/platforms/moz.build b/dom/media/platforms/moz.build index c46d52e3f..23bea20dd 100644 --- a/dom/media/platforms/moz.build +++ b/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', @@ -42,7 +42,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', ] @@ -60,7 +60,7 @@ if CONFIG['MOZ_AV1']: EXPORTS += [ 'agnostic/AOMDecoder.h', ] - UNIFIED_SOURCES += [ + SOURCES += [ 'agnostic/AOMDecoder.cpp', ] @@ -68,7 +68,7 @@ if CONFIG['MOZ_APPLEMEDIA']: EXPORTS += [ 'apple/AppleDecoderModule.h', ] - UNIFIED_SOURCES += [ + SOURCES += [ 'apple/AppleATDecoder.cpp', 'apple/AppleCMLinker.cpp', 'apple/AppleDecoderModule.cpp', @@ -85,7 +85,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': EXPORTS += [ 'android/AndroidDecoderModule.h', ] - UNIFIED_SOURCES += [ + 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 15b3062a4..12a7d0595 100644 --- a/dom/media/platforms/omx/OmxPlatformLayer.cpp +++ b/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" diff --git a/dom/media/platforms/omx/OmxPlatformLayer.h b/dom/media/platforms/omx/OmxPlatformLayer.h index 67d9e448f..8e751e1a7 100644 --- a/dom/media/platforms/omx/OmxPlatformLayer.h +++ b/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" diff --git a/dom/media/platforms/omx/moz.build b/dom/media/platforms/omx/moz.build index 661e280e0..ee7202bd3 100644 --- a/dom/media/platforms/omx/moz.build +++ b/dom/media/platforms/omx/moz.build @@ -8,7 +8,7 @@ EXPORTS += [ 'OmxDecoderModule.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'OmxDataDecoder.cpp', 'OmxDecoderModule.cpp', 'OmxPlatformLayer.cpp', diff --git a/dom/media/platforms/wmf/moz.build b/dom/media/platforms/wmf/moz.build index fa966bea2..83c2249e1 100644 --- a/dom/media/platforms/wmf/moz.build +++ b/dom/media/platforms/wmf/moz.build @@ -14,6 +14,7 @@ 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 7df020f46..e8b451cc8 100644 --- a/dom/media/platforms/wrappers/FuzzingWrapper.cpp +++ b/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; diff --git a/dom/media/platforms/wrappers/H264Converter.cpp b/dom/media/platforms/wrappers/H264Converter.cpp index 0edbfc10c..cca03fceb 100644 --- a/dom/media/platforms/wrappers/H264Converter.cpp +++ b/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" -- cgit v1.2.3 From 54e4a32da5ed7cbe25901038678c3baf111eb1a2 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Wed, 22 Apr 2020 18:53:58 +0000 Subject: Issue #80 - De-unify dom/media part 3 Excluding /dom/media/webrtc for bad template use: MediaTrackConstraints.cpp/h MediaEngineCameraVideoSource.cpp and MediaEngineRemoteVideoSource.cpp --- dom/media/webaudio/AudioContext.cpp | 1 + dom/media/webaudio/AudioDestinationNode.cpp | 1 + dom/media/webaudio/AudioEventTimeline.h | 1 + dom/media/webaudio/AudioNodeEngine.cpp | 1 + dom/media/webaudio/AudioNodeStream.cpp | 1 + dom/media/webaudio/ConstantSourceNode.cpp | 2 ++ dom/media/webaudio/DelayBuffer.h | 1 + dom/media/webaudio/IIRFilterNode.cpp | 6 ++++++ dom/media/webaudio/MediaBufferDecoder.cpp | 1 + dom/media/webaudio/MediaStreamAudioSourceNode.cpp | 2 ++ dom/media/webaudio/WebAudioUtils.cpp | 1 + dom/media/webaudio/moz.build | 2 +- dom/media/webrtc/MediaEngineRemoteVideoSource.cpp | 3 +++ dom/media/webrtc/MediaEngineTabVideoSource.cpp | 1 + dom/media/webrtc/MediaEngineWebRTCAudio.cpp | 1 + dom/media/webrtc/PeerIdentity.h | 2 ++ dom/media/webrtc/moz.build | 11 ++++++----- dom/media/webspeech/recognition/SpeechGrammarList.cpp | 1 + dom/media/webspeech/recognition/SpeechGrammarList.h | 1 + dom/media/webspeech/recognition/SpeechRecognition.cpp | 1 + dom/media/webspeech/recognition/moz.build | 6 +++--- dom/media/webspeech/synth/moz.build | 4 ++-- dom/media/webspeech/synth/pico/moz.build | 2 +- dom/media/webspeech/synth/speechd/moz.build | 2 +- dom/media/webspeech/synth/windows/moz.build | 2 +- 25 files changed, 43 insertions(+), 14 deletions(-) (limited to 'dom/media') diff --git a/dom/media/webaudio/AudioContext.cpp b/dom/media/webaudio/AudioContext.cpp index d58441309..75f57a630 100755 --- a/dom/media/webaudio/AudioContext.cpp +++ b/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" diff --git a/dom/media/webaudio/AudioDestinationNode.cpp b/dom/media/webaudio/AudioDestinationNode.cpp index 29a9de736..f23eb0377 100644 --- a/dom/media/webaudio/AudioDestinationNode.cpp +++ b/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" diff --git a/dom/media/webaudio/AudioEventTimeline.h b/dom/media/webaudio/AudioEventTimeline.h index ae06ad4db..ba6da56a3 100644 --- a/dom/media/webaudio/AudioEventTimeline.h +++ b/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" diff --git a/dom/media/webaudio/AudioNodeEngine.cpp b/dom/media/webaudio/AudioNodeEngine.cpp index 91170adb3..89eefef31 100644 --- a/dom/media/webaudio/AudioNodeEngine.cpp +++ b/dom/media/webaudio/AudioNodeEngine.cpp @@ -14,6 +14,7 @@ #include "AlignmentUtils.h" #include "AudioNodeEngineSSE2.h" #endif +#include "AudioBlock.h" namespace mozilla { diff --git a/dom/media/webaudio/AudioNodeStream.cpp b/dom/media/webaudio/AudioNodeStream.cpp index 0e5aa3fc7..ba002b70e 100644 --- a/dom/media/webaudio/AudioNodeStream.cpp +++ b/dom/media/webaudio/AudioNodeStream.cpp @@ -5,6 +5,7 @@ #include "AudioNodeStream.h" +#include "AlignmentUtils.h" #include "MediaStreamGraphImpl.h" #include "MediaStreamListener.h" #include "AudioNodeEngine.h" diff --git a/dom/media/webaudio/ConstantSourceNode.cpp b/dom/media/webaudio/ConstantSourceNode.cpp index b6884105c..8b9df7c89 100644 --- a/dom/media/webaudio/ConstantSourceNode.cpp +++ b/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 { diff --git a/dom/media/webaudio/DelayBuffer.h b/dom/media/webaudio/DelayBuffer.h index e55d0ba83..e6c9434bf 100644 --- a/dom/media/webaudio/DelayBuffer.h +++ b/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 diff --git a/dom/media/webaudio/IIRFilterNode.cpp b/dom/media/webaudio/IIRFilterNode.cpp index 3a69a94c8..9175cc4c9 100644 --- a/dom/media/webaudio/IIRFilterNode.cpp +++ b/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" diff --git a/dom/media/webaudio/MediaBufferDecoder.cpp b/dom/media/webaudio/MediaBufferDecoder.cpp index f3b75ca1a..f590d2f68 100644 --- a/dom/media/webaudio/MediaBufferDecoder.cpp +++ b/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" diff --git a/dom/media/webaudio/MediaStreamAudioSourceNode.cpp b/dom/media/webaudio/MediaStreamAudioSourceNode.cpp index beedd5300..31b276a54 100644 --- a/dom/media/webaudio/MediaStreamAudioSourceNode.cpp +++ b/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 { diff --git a/dom/media/webaudio/WebAudioUtils.cpp b/dom/media/webaudio/WebAudioUtils.cpp index 6289f803b..aa0c7f9ea 100644 --- a/dom/media/webaudio/WebAudioUtils.cpp +++ b/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" diff --git a/dom/media/webaudio/moz.build b/dom/media/webaudio/moz.build index d1a9f5680..c4bfcea60 100644 --- a/dom/media/webaudio/moz.build +++ b/dom/media/webaudio/moz.build @@ -75,7 +75,7 @@ EXPORTS.mozilla.dom += [ 'WaveShaperNode.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'AnalyserNode.cpp', 'AudioBlock.cpp', 'AudioBuffer.cpp', 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/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 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', ] diff --git a/dom/media/webspeech/recognition/SpeechGrammarList.cpp b/dom/media/webspeech/recognition/SpeechGrammarList.cpp index d4883378f..925e591aa 100644 --- a/dom/media/webspeech/recognition/SpeechGrammarList.cpp +++ b/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 { diff --git a/dom/media/webspeech/recognition/SpeechGrammarList.h b/dom/media/webspeech/recognition/SpeechGrammarList.h index dbe7117fe..32c0ddbdd 100644 --- a/dom/media/webspeech/recognition/SpeechGrammarList.h +++ b/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" diff --git a/dom/media/webspeech/recognition/SpeechRecognition.cpp b/dom/media/webspeech/recognition/SpeechRecognition.cpp index 48b1177b2..cd57f03ca 100644 --- a/dom/media/webspeech/recognition/SpeechRecognition.cpp +++ b/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" diff --git a/dom/media/webspeech/recognition/moz.build b/dom/media/webspeech/recognition/moz.build index 0a26021b0..c296cd40d 100644 --- a/dom/media/webspeech/recognition/moz.build +++ b/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', ] diff --git a/dom/media/webspeech/synth/moz.build b/dom/media/webspeech/synth/moz.build index bb26515af..7b8c4cd31 100644 --- a/dom/media/webspeech/synth/moz.build +++ b/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' ] diff --git a/dom/media/webspeech/synth/pico/moz.build b/dom/media/webspeech/synth/pico/moz.build index 01ef30450..8c360bc85 100644 --- a/dom/media/webspeech/synth/pico/moz.build +++ b/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' ] diff --git a/dom/media/webspeech/synth/speechd/moz.build b/dom/media/webspeech/synth/speechd/moz.build index 51d675c10..552ccf856 100644 --- a/dom/media/webspeech/synth/speechd/moz.build +++ b/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' ] diff --git a/dom/media/webspeech/synth/windows/moz.build b/dom/media/webspeech/synth/windows/moz.build index f0ff9f2c9..2ab20c05a 100644 --- a/dom/media/webspeech/synth/windows/moz.build +++ b/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' ] -- cgit v1.2.3 From d99fc2ead2fc5735537529e1709c6be1107f8a2a Mon Sep 17 00:00:00 2001 From: adeshkp Date: Fri, 24 Apr 2020 10:21:33 -0400 Subject: Issue #80 - Fix includes in dom/media/platforms for Mac build --- dom/media/platforms/apple/AppleCMLinker.cpp | 2 ++ dom/media/platforms/apple/AppleVTDecoder.cpp | 5 ++++- dom/media/platforms/apple/AppleVTLinker.cpp | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) (limited to 'dom/media') diff --git a/dom/media/platforms/apple/AppleCMLinker.cpp b/dom/media/platforms/apple/AppleCMLinker.cpp index 5227bf9e5..b1417b46a 100644 --- a/dom/media/platforms/apple/AppleCMLinker.cpp +++ b/dom/media/platforms/apple/AppleCMLinker.cpp @@ -7,7 +7,9 @@ #include #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__)) diff --git a/dom/media/platforms/apple/AppleVTDecoder.cpp b/dom/media/platforms/apple/AppleVTDecoder.cpp index 81638870a..93a480266 100644 --- a/dom/media/platforms/apple/AppleVTDecoder.cpp +++ b/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 macSurface = new MacIOSurface(surface); - RefPtr image = new MacIOSurfaceImage(macSurface); + RefPtr image = new layers::MacIOSurfaceImage(macSurface); data = VideoData::CreateFromImage(info, diff --git a/dom/media/platforms/apple/AppleVTLinker.cpp b/dom/media/platforms/apple/AppleVTLinker.cpp index 51a8a0122..287de3ed3 100644 --- a/dom/media/platforms/apple/AppleVTLinker.cpp +++ b/dom/media/platforms/apple/AppleVTLinker.cpp @@ -7,7 +7,9 @@ #include #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__)) -- cgit v1.2.3 From 756162415bde12e60125f0b3a69e321c45956ae3 Mon Sep 17 00:00:00 2001 From: New Tobin Paradigm Date: Fri, 24 Apr 2020 17:41:17 -0400 Subject: Add Unused.h to dom/media/webrtc/MediaTrackConstraints.cpp --- dom/media/webrtc/MediaTrackConstraints.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'dom/media') 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 #include -- cgit v1.2.3