Bug 1382182 - Build mediapipeline using moz.build; r?ted,jesup
MozReview-Commit-ID: 7yJMgrsCgzO
--- a/media/webrtc/signaling/moz.build
+++ b/media/webrtc/signaling/moz.build
@@ -1,10 +1,11 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIRS += [
'src/jsep',
'src/media-conduit',
+ 'src/mediapipeline',
'src/sdp',
]
--- a/media/webrtc/signaling/signaling.gyp
+++ b/media/webrtc/signaling/signaling.gyp
@@ -114,23 +114,16 @@
'./src/peerconnection/MediaPipelineFactory.cpp',
'./src/peerconnection/MediaPipelineFactory.h',
'./src/peerconnection/PeerConnectionCtx.cpp',
'./src/peerconnection/PeerConnectionCtx.h',
'./src/peerconnection/PeerConnectionImpl.cpp',
'./src/peerconnection/PeerConnectionImpl.h',
'./src/peerconnection/PeerConnectionMedia.cpp',
'./src/peerconnection/PeerConnectionMedia.h',
- # Media pipeline
- './src/mediapipeline/MediaPipeline.h',
- './src/mediapipeline/MediaPipeline.cpp',
- './src/mediapipeline/MediaPipelineFilter.h',
- './src/mediapipeline/MediaPipelineFilter.cpp',
- './src/mediapipeline/RtpLogger.h',
- './src/mediapipeline/RtpLogger.cpp',
],
#
# DEFINES
#
'defines' : [
'LOG4CXX_STATIC',
@@ -154,30 +147,16 @@
'$(MOZ_PIXMAN_CFLAGS)',
],
#
# Conditionals
#
'conditions': [
- # hack so I can change the include flow for SrtpFlow
- ['build_with_mozilla==1', {
- 'sources': [
- './src/mediapipeline/SrtpFlow.h',
- './src/mediapipeline/SrtpFlow.cpp',
- ],
- 'include_dirs!': [
- '../trunk/webrtc',
- ],
- 'include_dirs': [
- '../../../netwerk/srtp/src/include',
- '../../../netwerk/srtp/src/crypto/include',
- ],
- }],
['moz_webrtc_mediacodec==1', {
'include_dirs': [
'../../../widget/android',
],
'sources': [
'./src/media-conduit/MediaCodecVideoCodec.h',
'./src/media-conduit/WebrtcMediaCodecVP8VideoCodec.h',
'./src/media-conduit/MediaCodecVideoCodec.cpp',
new file mode 100644
--- /dev/null
+++ b/media/webrtc/signaling/src/mediapipeline/moz.build
@@ -0,0 +1,30 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+include('../../../webrtc.mozbuild')
+
+LOCAL_INCLUDES += [
+ '/dom/media',
+ '/media/libyuv/libyuv/include',
+ '/media/mtransport',
+ '/media/webrtc',
+ '/media/webrtc/signaling/src/media-conduit',
+ '/media/webrtc/trunk',
+ '/netwerk/srtp/src/crypto/include',
+ '/netwerk/srtp/src/include',
+]
+
+# Duplicate definition of getLogModule
+SOURCES += [
+ 'MediaPipeline.cpp',
+ 'MediaPipelineFilter.cpp',
+ 'RtpLogger.cpp',
+ 'SrtpFlow.cpp',
+]
+
+FINAL_LIBRARY = 'xul'
+
+if CONFIG['GNU_CXX']:
+ CXXFLAGS += ['-Wno-shadow']