summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-04-22 18:53:58 +0000
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-26 10:18:59 +0200
commit8ff6e8c8a2200db8307c158ce65d16e29abd3418 (patch)
tree4e46f40e1424c5a195eb3eaf594d653a28728797
parent3652cd0f998b0499c3ed1d03d2042bbaf69e0699 (diff)
downloadUXP-8ff6e8c8a2200db8307c158ce65d16e29abd3418.tar
UXP-8ff6e8c8a2200db8307c158ce65d16e29abd3418.tar.gz
UXP-8ff6e8c8a2200db8307c158ce65d16e29abd3418.tar.lz
UXP-8ff6e8c8a2200db8307c158ce65d16e29abd3418.tar.xz
UXP-8ff6e8c8a2200db8307c158ce65d16e29abd3418.zip
Issue #80 - De-unify dom/media part 3
Excluding /dom/media/webrtc for bad template use: MediaTrackConstraints.cpp/h MediaEngineCameraVideoSource.cpp and MediaEngineRemoteVideoSource.cpp
-rwxr-xr-xdom/media/webaudio/AudioContext.cpp1
-rw-r--r--dom/media/webaudio/AudioDestinationNode.cpp1
-rw-r--r--dom/media/webaudio/AudioEventTimeline.h1
-rw-r--r--dom/media/webaudio/AudioNodeEngine.cpp1
-rw-r--r--dom/media/webaudio/AudioNodeStream.cpp1
-rw-r--r--dom/media/webaudio/ConstantSourceNode.cpp2
-rw-r--r--dom/media/webaudio/DelayBuffer.h1
-rw-r--r--dom/media/webaudio/IIRFilterNode.cpp6
-rw-r--r--dom/media/webaudio/MediaBufferDecoder.cpp1
-rw-r--r--dom/media/webaudio/MediaStreamAudioSourceNode.cpp2
-rw-r--r--dom/media/webaudio/WebAudioUtils.cpp1
-rw-r--r--dom/media/webaudio/moz.build2
-rw-r--r--dom/media/webrtc/MediaEngineRemoteVideoSource.cpp3
-rw-r--r--dom/media/webrtc/MediaEngineTabVideoSource.cpp1
-rw-r--r--dom/media/webrtc/MediaEngineWebRTCAudio.cpp1
-rw-r--r--dom/media/webrtc/PeerIdentity.h2
-rw-r--r--dom/media/webrtc/moz.build11
-rw-r--r--dom/media/webspeech/recognition/SpeechGrammarList.cpp1
-rw-r--r--dom/media/webspeech/recognition/SpeechGrammarList.h1
-rw-r--r--dom/media/webspeech/recognition/SpeechRecognition.cpp1
-rw-r--r--dom/media/webspeech/recognition/moz.build6
-rw-r--r--dom/media/webspeech/synth/moz.build4
-rw-r--r--dom/media/webspeech/synth/pico/moz.build2
-rw-r--r--dom/media/webspeech/synth/speechd/moz.build2
-rw-r--r--dom/media/webspeech/synth/windows/moz.build2
25 files changed, 43 insertions, 14 deletions
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 T> class nsCOMPtr;
class nsIIDNService;
diff --git a/dom/media/webrtc/moz.build b/dom/media/webrtc/moz.build
index 66def8719..5b76e17cb 100644
--- a/dom/media/webrtc/moz.build
+++ b/dom/media/webrtc/moz.build
@@ -31,15 +31,14 @@ if CONFIG['MOZ_WEBRTC']:
UNIFIED_SOURCES += [
'MediaEngineCameraVideoSource.cpp',
'MediaEngineRemoteVideoSource.cpp',
+ ]
+ SOURCES += [
'MediaEngineTabVideoSource.cpp',
+ 'MediaEngineWebRTC.cpp',
'MediaEngineWebRTCAudio.cpp',
'RTCCertificate.cpp',
'RTCIdentityProviderRegistrar.cpp',
]
- # MediaEngineWebRTC.cpp needs to be built separately.
- SOURCES += [
- 'MediaEngineWebRTC.cpp',
- ]
LOCAL_INCLUDES += [
'/dom/base',
'/media/libyuv/include',
@@ -53,8 +52,10 @@ XPIDL_SOURCES += [
]
UNIFIED_SOURCES += [
- 'MediaEngineDefault.cpp',
'MediaTrackConstraints.cpp',
+]
+SOURCES += [
+ 'MediaEngineDefault.cpp',
'PeerIdentity.cpp',
]
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'
]