Bug 939584 - Build some of the directories under content/media in unified mode; r=roc

content/media/apple/moz.build

@@ -11,7 +11,7 @@ EXPORTS += [
     'AppleMP3Reader.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'AppleDecoder.cpp',
     'AppleMP3Reader.cpp',
 ]

content/media/encoder/moz.build

@@ -14,14 +14,14 @@ EXPORTS += [
     'TrackMetadataBase.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'MediaEncoder.cpp',
     'TrackEncoder.cpp',
 ]
 
 if CONFIG['MOZ_OPUS']:
     EXPORTS += ['OpusTrackEncoder.h']
-    SOURCES += ['OpusTrackEncoder.cpp']
+    UNIFIED_SOURCES += ['OpusTrackEncoder.cpp']
 
 LIBRARY_NAME = 'gkconencoder_s'
 

content/media/mediasource/moz.build

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

content/media/ogg/moz.build

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

content/media/raw/moz.build

@@ -12,7 +12,7 @@ EXPORTS += [
     'RawStructs.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'RawDecoder.cpp',
     'RawReader.cpp',
 ]

content/media/wave/moz.build

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

content/media/webm/WebMBufferedParser.h

@@ -10,10 +10,12 @@
 #include "nsTArray.h"
 #include "mozilla/ReentrantMonitor.h"
 
-class TimeRanges;
-
 namespace mozilla {
 
+namespace dom {
+class TimeRanges;
+}
+
 // Stores a stream byte offset and the scaled timecode of the block at
 // that offset.  The timecode must be scaled by the stream's timecode
 // scale before use.

content/media/webm/moz.build

@@ -11,7 +11,7 @@ EXPORTS += [
     'WebMReader.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'WebMBufferedParser.cpp',
     'WebMDecoder.cpp',
     'WebMReader.cpp',

content/media/webrtc/MediaEngineWebRTCAudio.cpp

@@ -14,6 +14,10 @@
 
 namespace mozilla {
 
+#ifdef LOG
+#undef LOG
+#endif
+
 #ifdef PR_LOGGING
 extern PRLogModuleInfo* GetMediaManagerLog();
 #define LOG(msg) PR_LOG(GetMediaManagerLog(), PR_LOG_DEBUG, msg)

content/media/webrtc/moz.build

@@ -15,13 +15,16 @@ EXPORTS += [
 
 if CONFIG['MOZ_WEBRTC']:
     EXPORTS += ['LoadMonitor.h', 'MediaEngineWebRTC.h']
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'LoadMonitor.cpp',
         'MediaEngineTabVideoSource.cpp',
-        'MediaEngineWebRTC.cpp',
         'MediaEngineWebRTCAudio.cpp',
         'MediaEngineWebRTCVideo.cpp',
     ]
+    # MediaEngineWebRTC.cpp needs to be built separately.
+    SOURCES += [
+        'MediaEngineWebRTC.cpp',
+    ]
     LOCAL_INCLUDES += [
         '/dom/base',
         '/dom/camera',
@@ -34,7 +37,7 @@ XPIDL_SOURCES += [
     'nsITabSource.idl'
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'MediaEngineDefault.cpp',
 ]
 

content/media/webspeech/recognition/moz.build

@@ -25,7 +25,7 @@ EXPORTS.mozilla.dom += [
     'test/FakeSpeechRecognitionService.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'EnableWebSpeechRecognitionCheck.cpp',
     'endpointer.cc',
     'energy_endpointer.cc',

content/media/webspeech/synth/moz.build

@@ -27,7 +27,7 @@ if CONFIG['MOZ_WEBSPEECH']:
         'SpeechSynthesisVoice.h',
     ]
 
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'EnableSpeechSynthesisCheck.cpp',
         'ipc/SpeechSynthesisChild.cpp',
         'ipc/SpeechSynthesisParent.cpp',

content/media/webspeech/synth/nsSpeechTask.cpp

@@ -8,6 +8,12 @@
 #include "nsSpeechTask.h"
 #include "SpeechSynthesis.h"
 
+// GetCurrentTime is defined in winbase.h as zero argument macro forwarding to
+// GetTickCount() and conflicts with nsSpeechTask::GetCurrentTime().
+#ifdef GetCurrentTime
+#undef GetCurrentTime
+#endif
+
 #undef LOG
 #ifdef PR_LOGGING
 extern PRLogModuleInfo* GetSpeechSynthLog();