generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor the gyp file to gypi file.

Browse Source 
Basically, the gypi file is a copy of gyp file, but has some difference on the
path of the dependencies.
Review URL: http://webrtc-codereview.appspot.com/137020

git-svn-id: http://webrtc.googlecode.com/svn/trunk@581 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
xians@google.com 2011-09-12 12:24:39 +00:00
parent 0cc68dc38a
commit d3185fe219
59 changed files with 634 additions and 588 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/build/common.gypi
View File

@ -50,12 +50,16 @@
# Exclude internal ADM since Chromium uses its own IO handling. # Exclude internal ADM since Chromium uses its own IO handling.
'include_internal_audio_device%': 0, 'include_internal_audio_device%': 0,
'webrtc_root%': '<(DEPTH)/third_party/webrtc',
}, { }, {
# Settings for the standalone (not-in-Chromium) build. # Settings for the standalone (not-in-Chromium) build.
'include_pulse_audio%': 1, 'include_pulse_audio%': 1,
'include_internal_audio_device%': 1, 'include_internal_audio_device%': 1,
'webrtc_root%': '<(DEPTH)/src',
# The Chromium common.gypi we use treats all gyp files without # The Chromium common.gypi we use treats all gyp files without
# chromium_code==1 as third party code. This disables many of the # chromium_code==1 as third party code. This disables many of the
# preferred warning settings. # preferred warning settings.

16
src/common_audio/common_audio.gyp Normal file
View File

@ -0,0 +1,16 @@
# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{
'includes': [
'../common_settings.gypi', # Common settings
'signal_processing_library/main/source/spl.gypi',
'resampler/main/source/resampler.gypi',
'vad/main/source/vad.gypi',
],
}

5
src/common_audio/resampler/main/source/resampler.gyp → src/common_audio/resampler/main/source/resampler.gypi
View File

@ -7,15 +7,12 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'resampler', 'target_name': 'resampler',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../signal_processing_library/main/source/spl.gyp:spl', 'spl',
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',

3
src/common_audio/signal_processing_library/main/source/spl.gyp → src/common_audio/signal_processing_library/main/source/spl.gypi
View File

@ -7,9 +7,6 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'spl', 'target_name': 'spl',

5
src/common_audio/vad/main/source/vad.gyp → src/common_audio/vad/main/source/vad.gypi
View File

@ -7,15 +7,12 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'vad', 'target_name': 'vad',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../signal_processing_library/main/source/spl.gyp:spl', 'spl',
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',

15
src/common_video/common_video.gyp Normal file
View File

@ -0,0 +1,15 @@
# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{
'includes': [
'../common_settings.gypi', # Common settings
'vplib/main/source/vplib.gypi',
'jpeg/main/source/jpeg.gypi',
],
}

9
src/common_video/jpeg/main/source/jpeg.gyp → src/common_video/jpeg/main/source/jpeg.gypi
View File

@ -7,9 +7,6 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../common_settings.gypi', # Common settings
],
'variables': { 'variables': {
'use_libjpeg_turbo%': '<(use_libjpeg_turbo)', 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
}, },
@ -18,7 +15,7 @@
'target_name': 'webrtc_jpeg', 'target_name': 'webrtc_jpeg',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../vplib/main/source/vplib.gyp:webrtc_vplib', 'webrtc_vplib',
], ],
'include_dirs': [ 'include_dirs': [
'../../../interface', '../../../interface',
@ -40,11 +37,11 @@
'conditions': [ 'conditions': [
['use_libjpeg_turbo==1', { ['use_libjpeg_turbo==1', {
'dependencies': [ 'dependencies': [
'../../../../../third_party/libjpeg_turbo/libjpeg.gyp:libjpeg', '../../third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
], ],
}, { }, {
'dependencies': [ 'dependencies': [
'../../../../../third_party/libjpeg/libjpeg.gyp:libjpeg', '../../third_party/libjpeg/libjpeg.gyp:libjpeg',
], ],
}], }],
], ],

3
src/common_video/vplib/main/source/vplib.gyp → src/common_video/vplib/main/source/vplib.gypi
View File

@ -7,9 +7,6 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'webrtc_vplib', 'target_name': 'webrtc_vplib',

53
src/modules/audio_coding/NetEQ/main/source/neteq.gyp → src/modules/audio_coding/NetEQ/main/source/neteq.gypi
View File

@ -7,20 +7,17 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'NetEq', 'target_name': 'NetEq',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../codecs/CNG/main/source/cng.gyp:CNG', 'CNG',
'../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl', '<(webrtc_root)/common_audio/common_audio.gyp:spl',
], ],
'defines': [ 'defines': [
'NETEQ_VOICEENGINE_CODECS', # TODO: Should create a Chrome define which specifies a subset of codecs to support 'NETEQ_VOICEENGINE_CODECS', # TODO: Should create a Chrome define which
'SCRATCH', 'SCRATCH', # specifies a subset of codecs to support.
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',
@ -97,12 +94,12 @@
'dependencies': [ 'dependencies': [
'NetEq', # NetEQ library defined above 'NetEq', # NetEQ library defined above
'NetEqTestTools',# Test helpers 'NetEqTestTools',# Test helpers
'../../../codecs/G711/main/source/g711.gyp:G711', 'G711',
'../../../codecs/G722/main/source/g722.gyp:G722', 'G722',
'../../../codecs/PCM16B/main/source/pcm16b.gyp:PCM16B', 'PCM16B',
'../../../codecs/iLBC/main/source/ilbc.gyp:iLBC', 'iLBC',
'../../../codecs/iSAC/main/source/isac.gyp:iSAC', 'iSAC',
'../../../codecs/CNG/main/source/cng.gyp:CNG', 'CNG',
], ],
'defines': [ 'defines': [
# TODO: Make codec selection conditional on definitions in target NetEq # TODO: Make codec selection conditional on definitions in target NetEq
@ -121,7 +118,7 @@
'CODEC_RED', 'CODEC_RED',
], ],
'include_dirs': [ 'include_dirs': [
'../source', './',
'../test', '../test',
], ],
'sources': [ 'sources': [
@ -133,13 +130,13 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'NetEqTestTools',# Test helpers 'NetEqTestTools',# Test helpers
'../../../codecs/G711/main/source/g711.gyp:G711', 'G711',
'../../../codecs/G722/main/source/g722.gyp:G722', 'G722',
'../../../codecs/PCM16B/main/source/pcm16b.gyp:PCM16B', 'PCM16B',
'../../../codecs/iLBC/main/source/ilbc.gyp:iLBC', 'iLBC',
'../../../codecs/iSAC/main/source/isac.gyp:iSAC', 'iSAC',
'../../../codecs/CNG/main/source/cng.gyp:CNG', 'CNG',
'../../../../../common_audio/vad/main/source/vad.gyp:vad', '<(webrtc_root)/common_audio/common_audio.gyp:vad',
], ],
'defines': [ 'defines': [
# TODO: Make codec selection conditional on definitions in target NetEq # TODO: Make codec selection conditional on definitions in target NetEq
@ -239,12 +236,12 @@
# Collection of useful functions used in other tests # Collection of useful functions used in other tests
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../codecs/G711/main/source/g711.gyp:G711', 'G711',
'../../../codecs/G722/main/source/g722.gyp:G722', 'G722',
'../../../codecs/PCM16B/main/source/pcm16b.gyp:PCM16B', 'PCM16B',
'../../../codecs/iLBC/main/source/ilbc.gyp:iLBC', 'iLBC',
'../../../codecs/iSAC/main/source/isac.gyp:iSAC', 'iSAC',
'../../../codecs/CNG/main/source/cng.gyp:CNG', 'CNG',
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
'include_dirs': [ 'include_dirs': [
@ -269,7 +266,7 @@
'CODEC_RED', 'CODEC_RED',
], ],
'include_dirs': [ 'include_dirs': [
'../source', './',
'../interface', '../interface',
'../test', '../test',
], ],

5
src/modules/audio_coding/codecs/CNG/main/source/cng.gyp → src/modules/audio_coding/codecs/CNG/main/source/cng.gypi
View File

@ -7,15 +7,12 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'CNG', 'target_name': 'CNG',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl', '<(webrtc_root)/common_audio/common_audio.gyp:spl',
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',

3
src/modules/audio_coding/codecs/G711/main/source/g711.gyp → src/modules/audio_coding/codecs/G711/main/source/g711.gypi
View File

@ -7,9 +7,6 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'G711', 'target_name': 'G711',

3
src/modules/audio_coding/codecs/G722/main/source/g722.gyp → src/modules/audio_coding/codecs/G722/main/source/g722.gypi
View File

@ -6,9 +6,6 @@
# in the file PATENTS. All contributing project authors may # in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'G722', 'target_name': 'G722',

3
src/modules/audio_coding/codecs/PCM16B/main/source/pcm16b.gyp → src/modules/audio_coding/codecs/PCM16B/main/source/pcm16b.gypi
View File

@ -7,9 +7,6 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'PCM16B', 'target_name': 'PCM16B',

5
src/modules/audio_coding/codecs/iLBC/ilbc_test.gyp → src/modules/audio_coding/codecs/iLBC/ilbc_test.gypi
View File

@ -7,16 +7,13 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
# ilbc_test # ilbc_test
{ {
'target_name': 'iLBCtest', 'target_name': 'iLBCtest',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'./main/source/ilbc.gyp:iLBC', 'iLBC',
], ],
'include_dirs': [ 'include_dirs': [
'./main/interface', './main/interface',

5
src/modules/audio_coding/codecs/iLBC/main/source/ilbc.gyp → src/modules/audio_coding/codecs/iLBC/main/source/ilbc.gypi
View File

@ -7,15 +7,12 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'iLBC', 'target_name': 'iLBC',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl', '<(webrtc_root)/common_audio/common_audio.gyp:spl',
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',

5
src/modules/audio_coding/codecs/iSAC/fix/source/isacfix.gyp → src/modules/audio_coding/codecs/iSAC/fix/source/isacfix.gypi
View File

@ -7,15 +7,12 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'iSACFix', 'target_name': 'iSACFix',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl', '<(webrtc_root)/common_audio/common_audio.gyp:spl',
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',

9
src/modules/audio_coding/codecs/iSAC/isac_test.gyp → src/modules/audio_coding/codecs/iSAC/isac_test.gypi
View File

@ -7,16 +7,13 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
# simple kenny # simple kenny
{ {
'target_name': 'iSACtest', 'target_name': 'iSACtest',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'./main/source/isac.gyp:iSAC', 'iSAC',
], ],
'include_dirs': [ 'include_dirs': [
'./main/test', './main/test',
@ -33,7 +30,7 @@
'target_name': 'iSACAPITest', 'target_name': 'iSACAPITest',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'./main/source/isac.gyp:iSAC', 'iSAC',
], ],
'include_dirs': [ 'include_dirs': [
'./main/test', './main/test',
@ -50,7 +47,7 @@
'target_name': 'iSACSwitchSampRateTest', 'target_name': 'iSACSwitchSampRateTest',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'./main/source/isac.gyp:iSAC', 'iSAC',
], ],
'include_dirs': [ 'include_dirs': [
'./main/test', './main/test',

5
src/modules/audio_coding/codecs/iSAC/isacfix_test.gyp → src/modules/audio_coding/codecs/iSAC/isacfix_test.gypi
View File

@ -7,16 +7,13 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
# kenny # kenny
{ {
'target_name': 'iSACFixtest', 'target_name': 'iSACFixtest',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'./fix/source/isacfix.gyp:iSACFix', 'iSACFix',
], ],
'include_dirs': [ 'include_dirs': [
'./fix/test', './fix/test',

5
src/modules/audio_coding/codecs/iSAC/main/source/isac.gyp → src/modules/audio_coding/codecs/iSAC/main/source/isac.gypi
View File

@ -7,15 +7,12 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'iSAC', 'target_name': 'iSAC',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl', '<(webrtc_root)/common_audio/common_audio.gyp:spl',
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',

30
src/modules/audio_coding/main/source/audio_coding_module.gyp → src/modules/audio_coding/main/source/audio_coding_module.gypi
View File

@ -7,26 +7,23 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'audio_coding_module', 'target_name': 'audio_coding_module',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../codecs/CNG/main/source/cng.gyp:CNG', 'CNG',
'../../codecs/G711/main/source/g711.gyp:G711', 'G711',
'../../codecs/G722/main/source/g722.gyp:G722', 'G722',
'../../codecs/iLBC/main/source/ilbc.gyp:iLBC', 'iLBC',
'../../codecs/iSAC/main/source/isac.gyp:iSAC', 'iSAC',
'../../codecs/iSAC/fix/source/isacfix.gyp:iSACFix', 'iSACFix',
'../../codecs/PCM16B/main/source/pcm16b.gyp:PCM16B', 'PCM16B',
'../../NetEQ/main/source/neteq.gyp:NetEq', 'NetEq',
'../../../../common_audio/resampler/main/source/resampler.gyp:resampler', '<(webrtc_root)/common_audio/common_audio.gyp:resampler',
'../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl', '<(webrtc_root)/common_audio/common_audio.gyp:spl',
'../../../../common_audio/vad/main/source/vad.gyp:vad', '<(webrtc_root)/common_audio/common_audio.gyp:vad',
'../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',
@ -39,7 +36,6 @@
], ],
}, },
'sources': [ 'sources': [
# TODO: Remove files from here and P4 when ACM is slimmed down.
'../interface/audio_coding_module.h', '../interface/audio_coding_module.h',
'../interface/audio_coding_module_typedefs.h', '../interface/audio_coding_module_typedefs.h',
'acm_amr.cc', 'acm_amr.cc',
@ -104,7 +100,7 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'audio_coding_module', 'audio_coding_module',
'../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'sources': [ 'sources': [
'../test/ACMTest.cpp', '../test/ACMTest.cpp',

15
src/modules/audio_conference_mixer/source/audio_conference_mixer.gyp → src/modules/audio_conference_mixer/source/audio_conference_mixer.gypi
View File

@ -1,17 +1,18 @@
# Copyright (c) 2009 The Chromium Authors. All rights reserved. # Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
# Use of this source code is governed by a BSD-style license that can be #
# found in the LICENSE file. # Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'audio_conference_mixer', 'target_name': 'audio_conference_mixer',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',

19
src/modules/audio_device/main/source/audio_device.gyp → src/modules/audio_device/main/source/audio_device.gypi
View File

@ -7,17 +7,14 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../common_settings.gypi',
],
'targets': [ 'targets': [
{ {
'target_name': 'audio_device', 'target_name': 'audio_device',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../../common_audio/resampler/main/source/resampler.gyp:resampler', '<(webrtc_root)/common_audio/common_audio.gyp:resampler',
'../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl', '<(webrtc_root)/common_audio/common_audio.gyp:spl',
'../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'include_dirs': [ 'include_dirs': [
'.', '.',
@ -156,8 +153,8 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'audio_device', 'audio_device',
'../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', 'webrtc_utility',
'../../../utility/source/utility.gyp:webrtc_utility', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'sources': [ 'sources': [
'../test/audio_device_test_api.cc', '../test/audio_device_test_api.cc',
@ -169,9 +166,9 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'audio_device', 'audio_device',
'../../../../common_audio/resampler/main/source/resampler.gyp:resampler', 'webrtc_utility',
'../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/common_audio/common_audio.gyp:resampler',
'../../../utility/source/utility.gyp:webrtc_utility', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'sources': [ 'sources': [
'../test/audio_device_test_func.cc', '../test/audio_device_test_func.cc',

7
src/modules/audio_processing/aec/main/source/aec.gyp → src/modules/audio_processing/aec/main/source/aec.gypi
View File

@ -7,16 +7,13 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../../common_settings.gypi',
],
'targets': [ 'targets': [
{ {
'target_name': 'aec', 'target_name': 'aec',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl', '<(webrtc_root)/common_audio/common_audio.gyp:spl',
'../../../utility/util.gyp:apm_util' 'apm_util'
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',

7
src/modules/audio_processing/aecm/main/source/aecm.gyp → src/modules/audio_processing/aecm/main/source/aecm.gypi
View File

@ -7,16 +7,13 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../../common_settings.gypi',
],
'targets': [ 'targets': [
{ {
'target_name': 'aecm', 'target_name': 'aecm',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl', '<(webrtc_root)/common_audio/common_audio.gyp:spl',
'../../../utility/util.gyp:apm_util' 'apm_util'
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',

5
src/modules/audio_processing/agc/main/source/agc.gyp → src/modules/audio_processing/agc/main/source/agc.gypi
View File

@ -7,15 +7,12 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'agc', 'target_name': 'agc',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl', '<(webrtc_root)/common_audio/common_audio.gyp:spl',
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',

27
src/modules/audio_processing/main/apm_tests.gyp → src/modules/audio_processing/main/apm_tests.gypi
View File

@ -7,9 +7,6 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../common_settings.gypi',
],
'variables': { 'variables': {
'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out', 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
'protoc_out_relpath': 'webrtc/audio_processing', 'protoc_out_relpath': 'webrtc/audio_processing',
@ -27,12 +24,12 @@
], ],
'dependencies': [ 'dependencies': [
'unittest_proto', 'unittest_proto',
'source/apm.gyp:audio_processing', 'audio_processing',
'../../../common_audio/signal_processing_library/main/source/spl.gyp:spl', '<(webrtc_root)/common_audio/common_audio.gyp:spl',
'../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'../../../../testing/gtest.gyp:gtest', '<(webrtc_root)/../testing/gtest.gyp:gtest',
'../../../../testing/gtest.gyp:gtest_main', '<(webrtc_root)/../testing/gtest.gyp:gtest_main',
'../../../../third_party/protobuf/protobuf.gyp:protobuf_lite', '<(webrtc_root)/../third_party/protobuf/protobuf.gyp:protobuf_lite',
], ],
'include_dirs': [ 'include_dirs': [
'../../../../testing/gtest/include', '../../../../testing/gtest/include',
@ -75,7 +72,7 @@
}, },
], ],
'dependencies': [ 'dependencies': [
'../../../../third_party/protobuf/protobuf.gyp:protoc#host', '../../third_party/protobuf/protobuf.gyp:protoc#host',
], ],
# This target exports a hard dependency because it generates header # This target exports a hard dependency because it generates header
# files. # files.
@ -85,11 +82,11 @@
'target_name': 'process_test', 'target_name': 'process_test',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'source/apm.gyp:audio_processing', 'audio_processing',
'../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'../../../../testing/gtest.gyp:gtest', '<(webrtc_root)/../testing/gtest.gyp:gtest',
'../../../../testing/gtest.gyp:gtest_main', '<(webrtc_root)/../testing/gtest.gyp:gtest_main',
'../../../../third_party/protobuf/protobuf.gyp:protobuf_lite', '<(webrtc_root)/../third_party/protobuf/protobuf.gyp:protobuf_lite',
], ],
'include_dirs': [ 'include_dirs': [
'../../../../testing/gtest/include', '../../../../testing/gtest/include',

29
src/modules/audio_processing/main/source/apm.gyp → src/modules/audio_processing/main/source/apm.gypi
View File

@ -7,9 +7,6 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../common_settings.gypi',
],
'variables': { 'variables': {
'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out', 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
'protoc_out_relpath': 'webrtc/audio_processing', 'protoc_out_relpath': 'webrtc/audio_processing',
@ -20,30 +17,30 @@
'type': '<(library)', 'type': '<(library)',
'conditions': [ 'conditions': [
['prefer_fixed_point==1', { ['prefer_fixed_point==1', {
'dependencies': ['../../ns/main/source/ns.gyp:ns_fix'], 'dependencies': ['ns_fix'],
'defines': ['WEBRTC_NS_FIXED'], 'defines': ['WEBRTC_NS_FIXED'],
}, { }, {
'dependencies': ['../../ns/main/source/ns.gyp:ns'], 'dependencies': ['ns'],
'defines': ['WEBRTC_NS_FLOAT'], 'defines': ['WEBRTC_NS_FLOAT'],
}], }],
['build_with_chromium==1', { ['build_with_chromium==1', {
'dependencies': [ 'dependencies': [
'../../../../../protobuf/protobuf.gyp:protobuf_lite', '../../protobuf/protobuf.gyp:protobuf_lite',
], ],
}, { }, {
'dependencies': [ 'dependencies': [
'../../../../../third_party/protobuf/protobuf.gyp:protobuf_lite', '../../third_party/protobuf/protobuf.gyp:protobuf_lite',
], ],
}], }],
], ],
'dependencies': [ 'dependencies': [
'debug_proto', 'debug_proto',
'../../aec/main/source/aec.gyp:aec', 'aec',
'../../aecm/main/source/aecm.gyp:aecm', 'aecm',
'../../agc/main/source/agc.gyp:agc', 'agc',
'../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl', '<(webrtc_root)/common_audio/common_audio.gyp:spl',
'../../../../common_audio/vad/main/source/vad.gyp:vad', '<(webrtc_root)/common_audio/common_audio.gyp:vad',
'../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',
@ -89,7 +86,7 @@
'target_name': 'debug_proto', 'target_name': 'debug_proto',
'type': 'none', 'type': 'none',
'variables': { 'variables': {
'proto_relpath': '.', 'proto_relpath': 'audio_processing/main/source/',
}, },
'sources': [ 'sources': [
'<(proto_relpath)/debug.proto', '<(proto_relpath)/debug.proto',
@ -117,11 +114,11 @@
'conditions': [ 'conditions': [
['build_with_chromium==1', { ['build_with_chromium==1', {
'dependencies': [ 'dependencies': [
'../../../../../protobuf/protobuf.gyp:protoc#host', '../../protobuf/protobuf.gyp:protoc#host',
], ],
}, { }, {
'dependencies': [ 'dependencies': [
'../../../../../third_party/protobuf/protobuf.gyp:protoc#host', '../../third_party/protobuf/protobuf.gyp:protoc#host',
], ],
}], }],
], ],

9
src/modules/audio_processing/ns/main/source/ns.gyp → src/modules/audio_processing/ns/main/source/ns.gypi
View File

@ -7,16 +7,13 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../../common_settings.gypi',
],
'targets': [ 'targets': [
{ {
'target_name': 'ns', 'target_name': 'ns',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl', '<(webrtc_root)/common_audio/common_audio.gyp:spl',
'../../../utility/util.gyp:apm_util' 'apm_util'
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',
@ -39,7 +36,7 @@
'target_name': 'ns_fix', 'target_name': 'ns_fix',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl', '<(webrtc_root)/common_audio/common_audio.gyp:spl',
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',

3
src/modules/audio_processing/utility/util.gyp → src/modules/audio_processing/utility/util.gypi
View File

@ -7,9 +7,6 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../common_settings.gypi',
],
'targets': [ 'targets': [
{ {
'target_name': 'apm_util', 'target_name': 'apm_util',

48
src/modules/media_file/source/media_file.gyp
View File

@ -1,48 +0,0 @@
# Copyright (c) 2009 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'includes': [
'../../../common_settings.gypi', # Common settings
],
'targets': [
{
'target_name': 'media_file',
'type': '<(library)',
'dependencies': [
'../../utility/source/utility.gyp:webrtc_utility',
'../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'defines': [
'WEBRTC_MODULE_UTILITY_VIDEO', # for compiling support for video recording
],
'include_dirs': [
'../interface',
'../../interface',
],
'direct_dependent_settings': {
'include_dirs': [
'../interface',
'../../interface',
],
},
'sources': [
'../interface/media_file.h',
'../interface/media_file_defines.h',
'avi_file.cc',
'avi_file.h',
'media_file_impl.cc',
'media_file_impl.h',
'media_file_utility.cc',
'media_file_utility.h',
], # source
},
],
}
# Local Variables:
# tab-width:2
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=2 shiftwidth=2:

49
src/modules/media_file/source/media_file.gypi Normal file
View File

@ -0,0 +1,49 @@
# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{
'targets': [
{
'target_name': 'media_file',
'type': '<(library)',
'dependencies': [
'webrtc_utility',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'defines': [
'WEBRTC_MODULE_UTILITY_VIDEO', # for compiling support for video recording
],
'include_dirs': [
'../interface',
'../../interface',
],
'direct_dependent_settings': {
'include_dirs': [
'../interface',
'../../interface',
],
},
'sources': [
'../interface/media_file.h',
'../interface/media_file_defines.h',
'avi_file.cc',
'avi_file.h',
'media_file_impl.cc',
'media_file_impl.h',
'media_file_utility.cc',
'media_file_utility.h',
], # source
},
],
}
# Local Variables:
# tab-width:2
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=2 shiftwidth=2:

59
src/modules/modules.gyp Normal file
View File

@ -0,0 +1,59 @@
# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{
'includes': [
'../common_settings.gypi',
'audio_coding/codecs/CNG/main/source/cng.gypi',
'audio_coding/codecs/G711/main/source/g711.gypi',
'audio_coding/codecs/G722/main/source/g722.gypi',
'audio_coding/codecs/iLBC/main/source/ilbc.gypi',
'audio_coding/codecs/iSAC/main/source/isac.gypi',
'audio_coding/codecs/iSAC/fix/source/isacfix.gypi',
'audio_coding/codecs/PCM16B/main/source/pcm16b.gypi',
'audio_coding/main/source/audio_coding_module.gypi',
'audio_coding/NetEQ/main/source/neteq.gypi',
'audio_conference_mixer/source/audio_conference_mixer.gypi',
'audio_device/main/source/audio_device.gypi',
'audio_processing/utility/util.gypi',
'audio_processing/ns/main/source/ns.gypi',
'audio_processing/agc/main/source/agc.gypi',
'audio_processing/main/source/apm.gypi',
'audio_processing/aec/main/source/aec.gypi',
'audio_processing/aecm/main/source/aecm.gypi',
'media_file/source/media_file.gypi',
'udp_transport/source/udp_transport.gypi',
'utility/source/utility.gypi',
'video_coding/codecs/i420/main/source/i420.gypi',
'video_coding/codecs/test_framework/test_framework.gypi',
'video_coding/codecs/vp8/main/source/vp8.gypi',
'video_coding/main/source/video_coding.gypi',
'video_capture/main/source/video_capture.gypi',
'video_processing/main/source/video_processing.gypi',
'video_render/main/source/video_render.gypi',
'rtp_rtcp/source/rtp_rtcp.gypi',
'rtp_rtcp/test/bwe_standalone.gypi',
],
# Test targets, excluded when building with Chromium.
'conditions': [
['build_with_chromium==0', {
'includes': [
'audio_coding/codecs/iLBC/ilbc_test.gypi',
'audio_coding/codecs/iSAC/isac_test.gypi',
'audio_coding/codecs/iSAC/isacfix_test.gypi',
'audio_processing/main/apm_tests.gypi',
'rtp_rtcp/source/rtp_rtcp_tests.gypi',
'rtp_rtcp/test/test_bwe/test_bwe.gypi',
'rtp_rtcp/test/testFec/test_fec.gypi',
'video_coding/main/source/video_coding_test.gypi',
'video_processing/main/test/vpm_tests.gypi',
], # includes
}], # build_with_chromium
], # conditions
}

15
src/modules/rtp_rtcp/source/rtp_rtcp.gyp → src/modules/rtp_rtcp/source/rtp_rtcp.gypi
View File

@ -1,17 +1,18 @@
# Copyright (c) 2009 The Chromium Authors. All rights reserved. # Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
# Use of this source code is governed by a BSD-style license that can be #
# found in the LICENSE file. # Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'rtp_rtcp', 'target_name': 'rtp_rtcp',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',

16
src/modules/rtp_rtcp/source/rtp_rtcp_tests.gyp → src/modules/rtp_rtcp/source/rtp_rtcp_tests.gypi
View File

@ -7,17 +7,14 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'rtp_format_vp8_unittest', 'target_name': 'rtp_format_vp8_unittest',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'rtp_rtcp.gyp:rtp_rtcp', 'rtp_rtcp',
'../../../../testing/gtest.gyp:gtest', '../../testing/gtest.gyp:gtest',
'../../../../testing/gtest.gyp:gtest_main', '../../testing/gtest.gyp:gtest_main',
], ],
'include_dirs': [ 'include_dirs': [
'.', '.',
@ -26,14 +23,13 @@
'rtp_format_vp8_unittest.cc', 'rtp_format_vp8_unittest.cc',
], ],
}, },
{ {
'target_name': 'rtp_utility_test', 'target_name': 'rtp_utility_test',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'rtp_rtcp.gyp:rtp_rtcp', 'rtp_rtcp',
'../../../../testing/gtest.gyp:gtest', '../../testing/gtest.gyp:gtest',
'../../../../testing/gtest.gyp:gtest_main', '../../testing/gtest.gyp:gtest_main',
], ],
'include_dirs': [ 'include_dirs': [
'.', '.',

23
src/modules/rtp_rtcp/test/bwe_standalone.gyp → src/modules/rtp_rtcp/test/bwe_standalone.gypi
View File

@ -1,20 +1,21 @@
# Copyright (c) 2009 The Chromium Authors. All rights reserved. # Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
# Use of this source code is governed by a BSD-style license that can be #
# found in the LICENSE file. # Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'bwe_standalone', 'target_name': 'bwe_standalone',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'matlab_plotting', 'matlab_plotting',
'../source/rtp_rtcp.gyp:rtp_rtcp', 'rtp_rtcp',
'../../udp_transport/source/udp_transport.gyp:udp_transport', 'udp_transport',
'../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',
@ -47,7 +48,7 @@
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'matlab_plotting_include', 'matlab_plotting_include',
'../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'include_dirs': [ 'include_dirs': [
'/opt/matlab2010a/extern/include', '/opt/matlab2010a/extern/include',
@ -106,7 +107,7 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'matlab_plotting', 'matlab_plotting',
'../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'include_dirs': [ 'include_dirs': [
], ],

5
src/modules/rtp_rtcp/test/testFec/test_fec.gyp → src/modules/rtp_rtcp/test/testFec/test_fec.gypi
View File

@ -7,15 +7,12 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'test_fec', 'target_name': 'test_fec',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'../../source/rtp_rtcp.gyp:rtp_rtcp', 'rtp_rtcp',
], ],
'include_dirs': [ 'include_dirs': [

11
src/modules/rtp_rtcp/test/test_bwe/test_bwe.gyp → src/modules/rtp_rtcp/test/test_bwe/test_bwe.gypi
View File

@ -7,18 +7,15 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'test_bwe', 'target_name': 'test_bwe',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'../../source/rtp_rtcp.gyp:rtp_rtcp', 'rtp_rtcp',
'../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'../../../../../testing/gtest.gyp:gtest', '<(webrtc_root)/../testing/gtest.gyp:gtest',
'../../../../../testing/gtest.gyp:gtest_main', '<(webrtc_root)/../testing/gtest.gyp:gtest_main',
], ],
'include_dirs': [ 'include_dirs': [
'../../source', '../../source',

15
src/modules/udp_transport/source/udp_transport.gyp → src/modules/udp_transport/source/udp_transport.gypi
View File

@ -1,17 +1,18 @@
# Copyright (c) 2009 The Chromium Authors. All rights reserved. # Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
# Use of this source code is governed by a BSD-style license that can be #
# found in the LICENSE file. # Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'udp_transport', 'target_name': 'udp_transport',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',

21
src/modules/utility/source/utility.gyp → src/modules/utility/source/utility.gypi
View File

@ -1,19 +1,20 @@
# Copyright (c) 2009 The Chromium Authors. All rights reserved. # Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
# Use of this source code is governed by a BSD-style license that can be #
# found in the LICENSE file. # Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'webrtc_utility', 'target_name': 'webrtc_utility',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../audio_coding/main/source/audio_coding_module.gyp:audio_coding_module', 'audio_coding_module',
'../../../common_audio/resampler/main/source/resampler.gyp:resampler', '<(webrtc_root)/common_audio/common_audio.gyp:resampler',
'../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',
@ -50,7 +51,7 @@
'WEBRTC_MODULE_UTILITY_VIDEO', 'WEBRTC_MODULE_UTILITY_VIDEO',
], ],
'dependencies': [ 'dependencies': [
'../../video_coding/main/source/video_coding.gyp:webrtc_video_coding', 'webrtc_video_coding',
], ],
'include_dirs': [ 'include_dirs': [
'../../video_coding/main/interface', '../../video_coding/main/interface',

27
src/modules/video_capture/main/source/video_capture.gyp → src/modules/video_capture/main/source/video_capture.gypi
View File

@ -1,19 +1,20 @@
# Copyright (c) 2009 The Chromium Authors. All rights reserved. # Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
# Use of this source code is governed by a BSD-style license that can be #
# found in the LICENSE file. # Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'video_capture_module', 'target_name': 'video_capture_module',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib', 'webrtc_utility',
'../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/common_video/common_video.gyp:webrtc_vplib',
'../../../utility/source/utility.gyp:webrtc_utility', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',
@ -192,10 +193,10 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'video_capture_module', 'video_capture_module',
'../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'../../../utility/source/utility.gyp:webrtc_utility', 'webrtc_utility',
'../../../video_render/main/source/video_render.gyp:video_render_module', 'video_render_module',
'../../../video_coding/main/source/video_coding.gyp:webrtc_video_coding', 'webrtc_video_coding',
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',

39
src/modules/video_coding/codecs/i420/main/source/i420.gyp
View File

@ -1,39 +0,0 @@
# Copyright (c) 2009 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'includes': [
'../../../../../../common_settings.gypi', # Common settings
],
'targets': [
{
'target_name': 'webrtc_i420',
'type': '<(library)',
'dependencies': [
'../../../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'../interface',
'../../../interface',
'../../../../../../common_video/interface',
],
'direct_dependent_settings': {
'include_dirs': [
'../interface',
'../../../../../../common_video/interface',
],
},
'sources': [
'../interface/i420.h',
'i420.cc',
],
},
],
}
# Local Variables:
# tab-width:2
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=2 shiftwidth=2:

40
src/modules/video_coding/codecs/i420/main/source/i420.gypi Normal file
View File

@ -0,0 +1,40 @@
# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{
'targets': [
{
'target_name': 'webrtc_i420',
'type': '<(library)',
'dependencies': [
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'../interface',
'../../../interface',
'../../../../../../common_video/interface',
],
'direct_dependent_settings': {
'include_dirs': [
'../interface',
'../../../../../../common_video/interface',
],
},
'sources': [
'../interface/i420.h',
'i420.cc',
],
},
],
}
# Local Variables:
# tab-width:2
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=2 shiftwidth=2:

17
src/modules/video_coding/codecs/test_framework/test_framework.gyp → src/modules/video_coding/codecs/test_framework/test_framework.gypi
View File

@ -1,11 +1,12 @@
# Copyright (c) 2009 The Chromium Authors. All rights reserved. # Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
# Use of this source code is governed by a BSD-style license that can be #
# found in the LICENSE file. # Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../common_settings.gypi', # Common settings
],
# Exclude the test target when building with chromium. # Exclude the test target when building with chromium.
'conditions': [ 'conditions': [
['build_with_chromium==0', { ['build_with_chromium==0', {
@ -15,8 +16,8 @@
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'../../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib', '<(webrtc_root)/common_video/common_video.gyp:webrtc_vplib',
], ],
'include_dirs': [ 'include_dirs': [

39
src/modules/video_coding/codecs/vp8/main/source/vp8.gyp → src/modules/video_coding/codecs/vp8/main/source/vp8.gypi
View File

@ -1,17 +1,18 @@
# Copyright (c) 2009 The Chromium Authors. All rights reserved. # Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
# Use of this source code is governed by a BSD-style license that can be #
# found in the LICENSE file. # Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'webrtc_vp8', 'target_name': 'webrtc_vp8',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',
@ -24,8 +25,8 @@
'conditions': [ 'conditions': [
['target_arch=="arm"', { ['target_arch=="arm"', {
'dependencies': [ 'dependencies': [
'../../../../../../../libvpx/libvpx.gyp:libvpx_lib', '<(webrtc_root)/../libvpx/libvpx.gyp:libvpx_lib',
'../../../../../../../libvpx/libvpx.gyp:libvpx_include', '<(webrtc_root)/../libvpx/libvpx.gyp:libvpx_include',
], ],
}, { # arm }, { # arm
'conditions': [ 'conditions': [
@ -34,11 +35,11 @@
# We don't want to link with the static library inside Chromium # We don't want to link with the static library inside Chromium
# on Windows. Chromium uses the ffmpeg DLL and exports the # on Windows. Chromium uses the ffmpeg DLL and exports the
# necessary libvpx symbols for us. # necessary libvpx symbols for us.
'../../../../../../../libvpx/libvpx.gyp:libvpx_include', '<(webrtc_root)/../libvpx/libvpx.gyp:libvpx_include',
], ],
},{ # non-arm, win },{ # non-arm, win
'dependencies': [ 'dependencies': [
'../../../../../../../libvpx/libvpx.gyp:libvpx', '<(webrtc_root)/../libvpx/libvpx.gyp:libvpx',
], ],
'include_dirs': [ 'include_dirs': [
'../../../../../../../libvpx/source/libvpx', '../../../../../../../libvpx/source/libvpx',
@ -52,20 +53,14 @@
], ],
},{ },{
'dependencies': [ 'dependencies': [
'../../../../../../../third_party/libvpx/libvpx.gyp:libvpx', '<(webrtc_root)/../third_party/libvpx/libvpx.gyp:libvpx',
], ],
'include_dirs': [ 'include_dirs': [
'../../../../../../../third_party/libvpx/source/libvpx', '../../../../../../../third_party/libvpx/source/libvpx',
], ],
'defines': [ 'defines': [
'WEBRTC_LIBVPX_VERSION=971', # Cayuga 'WEBRTC_LIBVPX_VERSION=971' # Cayuga
#'INDEPENDENT_PARTITIONS',
], ],
'direct_dependent_settings': {
'defines': [
#'INDEPENDENT_PARTITIONS',
],
},
}], }],
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
@ -89,10 +84,10 @@
'target_name': 'vp8_test', 'target_name': 'vp8_test',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'test_framework',
'webrtc_vp8', 'webrtc_vp8',
'../../../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/common_video/common_video.gyp:webrtc_vplib',
'../../../test_framework/test_framework.gyp:test_framework', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'../../../../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib'
], ],
'sources': [ 'sources': [
# header files # header files

21
src/modules/video_coding/main/source/video_coding.gyp → src/modules/video_coding/main/source/video_coding.gypi
View File

@ -1,20 +1,21 @@
# Copyright (c) 2009 The Chromium Authors. All rights reserved. # Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
# Use of this source code is governed by a BSD-style license that can be #
# found in the LICENSE file. # Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'webrtc_video_coding', 'target_name': 'webrtc_video_coding',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../codecs/i420/main/source/i420.gyp:webrtc_i420', 'webrtc_i420',
'../../codecs/vp8/main/source/vp8.gyp:webrtc_vp8', 'webrtc_vp8',
'../../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib', '<(webrtc_root)/common_video/common_video.gyp:webrtc_vplib',
'../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',

31
src/modules/video_coding/main/source/video_coding_test.gyp → src/modules/video_coding/main/source/video_coding_test.gypi
View File

@ -1,21 +1,22 @@
# Copyright (c) 2009 The Chromium Authors. All rights reserved. # Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
# Use of this source code is governed by a BSD-style license that can be #
# found in the LICENSE file. # Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'video_coding_test', 'target_name': 'video_coding_test',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'video_coding.gyp:webrtc_video_coding', 'webrtc_video_coding',
'../../../rtp_rtcp/source/rtp_rtcp.gyp:rtp_rtcp', 'rtp_rtcp',
'../../../utility/source/utility.gyp:webrtc_utility', 'webrtc_utility',
'../../../video_processing/main/source/video_processing.gyp:video_processing', 'video_processing',
'../../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib', '<(webrtc_root)/common_video/common_video.gyp:webrtc_vplib',
], ],
'include_dirs': [ 'include_dirs': [
'../../../interface', '../../../interface',
@ -76,10 +77,10 @@
'target_name': 'video_coding_unit_test', 'target_name': 'video_coding_unit_test',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', 'webrtc_video_coding',
'../../../../../testing/gtest.gyp:gtest', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'../../../../../testing/gtest.gyp:gtest_main', '<(webrtc_root)/../testing/gtest.gyp:gtest',
'video_coding.gyp:webrtc_video_coding', '<(webrtc_root)/../testing/gtest.gyp:gtest_main',
], ],
'include_dirs': [ 'include_dirs': [
'../../../interface', '../../../interface',

21
src/modules/video_processing/main/source/video_processing.gyp → src/modules/video_processing/main/source/video_processing.gypi
View File

@ -1,20 +1,21 @@
# Copyright (c) 2009 The Chromium Authors. All rights reserved. # Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
# Use of this source code is governed by a BSD-style license that can be #
# found in the LICENSE file. # Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'video_processing', 'target_name': 'video_processing',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl', 'webrtc_utility',
'../../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib', '<(webrtc_root)/common_audio/common_audio.gyp:spl',
'../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/common_video/common_video.gyp:webrtc_vplib',
'../../../utility/source/utility.gyp:webrtc_utility', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',

21
src/modules/video_processing/main/test/vpm_tests.gyp → src/modules/video_processing/main/test/vpm_tests.gypi
View File

@ -1,21 +1,22 @@
# Copyright (c) 2009 The Chromium Authors. All rights reserved. # Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
# Use of this source code is governed by a BSD-style license that can be #
# found in the LICENSE file. # Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'VPMUnitTest', 'target_name': 'VPMUnitTest',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'../source/video_processing.gyp:video_processing', 'video_processing',
'../../../utility/source/utility.gyp:webrtc_utility', 'webrtc_utility',
# The tests are based on gtest # The tests are based on gtest
'../../../../../testing/gtest.gyp:gtest', '../../testing/gtest.gyp:gtest',
'../../../../../testing/gtest.gyp:gtest_main', '../../testing/gtest.gyp:gtest_main',
], ],
'include_dirs': [ 'include_dirs': [
'../../../../system_wrappers/interface', '../../../../system_wrappers/interface',

25
src/modules/video_render/main/source/video_render.gyp → src/modules/video_render/main/source/video_render.gypi
View File

@ -1,19 +1,20 @@
# Copyright (c) 2009 The Chromium Authors. All rights reserved. # Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
# Use of this source code is governed by a BSD-style license that can be #
# found in the LICENSE file. # Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'video_render_module', 'target_name': 'video_render_module',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib', 'webrtc_utility',
'../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/common_video/common_video.gyp:webrtc_vplib',
'../../../utility/source/utility.gyp:webrtc_utility', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'include_dirs': [ 'include_dirs': [
'.', '.',
@ -135,9 +136,9 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'video_render_module', 'video_render_module',
'../../../utility/source/utility.gyp:webrtc_utility', 'webrtc_utility',
'../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'../../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib', '<(webrtc_root)/common_video/common_video.gyp:webrtc_vplib',
], ],
'include_dirs': [ 'include_dirs': [
], ],

43
src/video_engine.gyp
View File

@ -1,43 +0,0 @@
# Copyright (c) 2009 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'includes': [
'common_settings.gypi', # Common settings
'video_engine/main/test/AutoTest/vie_auto_test.gypi',
],
'variables': {
'autotest_name': 'vie_auto_test',
},
'targets': [
{
'target_name': 'merged_lib',
'type': 'none',
'dependencies': [
'<(autotest_name)',
],
'actions': [
{
'variables': {
'output_lib_name': 'webrtc',
'output_lib': '<(PRODUCT_DIR)/<(STATIC_LIB_PREFIX)<(output_lib_name)_<(OS)<(STATIC_LIB_SUFFIX)',
},
'action_name': 'merge_libs',
'inputs': ['<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)<(autotest_name)<(EXECUTABLE_SUFFIX)'],
'outputs': ['<(output_lib)'],
'action': ['python',
'./build/merge_libs.py',
'<(PRODUCT_DIR)',
'<(output_lib)'],
},
],
},
],
}
# Local Variables:
# tab-width:2
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=2 shiftwidth=2:

47
src/video_engine/main/source/video_engine_core.gyp → src/video_engine/main/source/video_engine_core.gypi
View File

@ -1,37 +1,38 @@
# Copyright (c) 2009 The Chromium Authors. All rights reserved. # Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
# Use of this source code is governed by a BSD-style license that can be #
# found in the LICENSE file. # Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../common_settings.gypi', # Common settings
],
'targets': [ 'targets': [
{ {
'target_name': 'video_engine_core', 'target_name': 'video_engine_core',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
## common_video # common_video
'../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib', '<(webrtc_root)/common_video/common_video.gyp:webrtc_vplib',
'../../../common_video/jpeg/main/source/jpeg.gyp:webrtc_jpeg', '<(webrtc_root)/common_video/common_video.gyp:webrtc_jpeg',
## ModulesShared # ModulesShared
'../../../modules/media_file/source/media_file.gyp:media_file', '<(webrtc_root)/modules/modules.gyp:media_file',
'../../../modules/rtp_rtcp/source/rtp_rtcp.gyp:rtp_rtcp', '<(webrtc_root)/modules/modules.gyp:rtp_rtcp',
'../../../modules/udp_transport/source/udp_transport.gyp:udp_transport', '<(webrtc_root)/modules/modules.gyp:udp_transport',
'../../../modules/utility/source/utility.gyp:webrtc_utility', '<(webrtc_root)/modules/modules.gyp:webrtc_utility',
## ModulesVideo # ModulesVideo
'../../../modules/video_coding/main/source/video_coding.gyp:webrtc_video_coding', '<(webrtc_root)/modules/modules.gyp:webrtc_video_coding',
'../../../modules/video_processing/main/source/video_processing.gyp:video_processing', '<(webrtc_root)/modules/modules.gyp:video_processing',
'../../../modules/video_render/main/source/video_render.gyp:video_render_module', '<(webrtc_root)/modules/modules.gyp:video_render_module',
## VoiceEngine # VoiceEngine
'../../../voice_engine/main/source/voice_engine_core.gyp:voice_engine_core', '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine_core',
## system_wrappers_2005 # system_wrappers
'../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',
@ -104,8 +105,6 @@
'vie_render_impl.cc', 'vie_render_impl.cc',
'vie_rtp_rtcp_impl.cc', 'vie_rtp_rtcp_impl.cc',
'vie_shared_data.cc', 'vie_shared_data.cc',
# ViE
'vie_capturer.cc', 'vie_capturer.cc',
'vie_channel.cc', 'vie_channel.cc',
'vie_channel_manager.cc', 'vie_channel_manager.cc',

54
src/video_engine/main/test/AutoTest/vie_auto_test.gypi
View File

@ -1,21 +1,47 @@
# Copyright (c) 2009 The Chromium Authors. All rights reserved. # Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
# Use of this source code is governed by a BSD-style license that can be #
# found in the LICENSE file. # Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [ 'variables': {
'../../../../common_settings.gypi', # Common settings 'autotest_name': 'vie_auto_test',
], },
'targets': [ 'targets': [
{
'target_name': 'merged_lib',
'type': 'none',
'dependencies': [
'<(autotest_name)',
],
'actions': [
{
'variables': {
'output_lib_name': 'webrtc',
'output_lib': '<(PRODUCT_DIR)/<(STATIC_LIB_PREFIX)<(output_lib_name)_<(OS)<(STATIC_LIB_SUFFIX)',
},
'action_name': 'merge_libs',
'inputs': ['<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)<(autotest_name)<(EXECUTABLE_SUFFIX)'],
'outputs': ['<(output_lib)'],
'action': ['python',
'../build/merge_libs.py',
'<(PRODUCT_DIR)',
'<(output_lib)'],
},
],
},
{ {
'target_name': '<(autotest_name)', 'target_name': '<(autotest_name)',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'modules/video_render/main/source/video_render.gyp:video_render_module', '<(webrtc_root)/modules/modules.gyp:video_render_module',
'modules/video_capture/main/source/video_capture.gyp:video_capture_module', '<(webrtc_root)/modules/modules.gyp:video_capture_module',
'voice_engine/main/source/voice_engine_core.gyp:voice_engine_core', '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine_core',
'video_engine/main/source/video_engine_core.gyp:video_engine_core', 'video_engine_core',
], ],
'include_dirs': [ 'include_dirs': [
'interface/', 'interface/',
@ -89,7 +115,7 @@
}], }],
['OS=="win"', { ['OS=="win"', {
'dependencies': [ 'dependencies': [
'video_engine/main/test/WindowsTest/windowstest.gyp:vie_win_test', 'vie_win_test',
], ],
}], }],
@ -137,7 +163,7 @@
], ],
'action': [ 'action': [
'/bin/sh', '-c', '/bin/sh', '-c',
'cp -f video_engine/main/test/AutoTest/media/* /tmp/', 'cp -f main/test/AutoTest/media/* /tmp/',
], ],
}, },
], ],
@ -155,7 +181,7 @@
], ],
'action': [ 'action': [
'cmd', '/c', 'cmd', '/c',
'xcopy /Y /R video_engine\\main\\test\\AutoTest\\media\\* \\tmp', 'xcopy /Y /R main\\test\\AutoTest\\media\\* \\tmp',
], ],
}, },
], ],

21
src/video_engine/main/test/WindowsTest/windowstest.gyp → src/video_engine/main/test/WindowsTest/windowstest.gypi
View File

@ -1,7 +1,12 @@
# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../../common_settings.gypi', # Common settings
],
'conditions': [ 'conditions': [
['OS=="win"', { ['OS=="win"', {
'targets': [ 'targets': [
@ -10,13 +15,13 @@
'target_name': 'vie_win_test', 'target_name': 'vie_win_test',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', # need the headers '<(webrtc_root)/modules/modules.gyp:video_render_module',
'../../../../modules/video_render/main/source/video_render.gyp:video_render_module', '<(webrtc_root)/modules/modules.gyp:video_capture_module',
'../../../../modules/video_capture/main/source/video_capture.gyp:video_capture_module', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
## VoiceEngine ## VoiceEngine
'../../../../voice_engine/main/source/voice_engine_core.gyp:voice_engine_core', '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine_core',
## VideoEngine ## VideoEngine
'../../source/video_engine_core.gyp:video_engine_core', 'video_engine_core',
], ],
'include_dirs': [ 'include_dirs': [
'./interface', './interface',

25
src/video_engine/video_engine.gyp Normal file
View File

@ -0,0 +1,25 @@
# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{
'includes': [
'../common_settings.gypi', # Common settings
'main/source/video_engine_core.gypi',
],
# Test targets, excluded when building with chromium.
'conditions': [
['build_with_chromium==0', {
'includes': [
'main/test/AutoTest/vie_auto_test.gypi',
'main/test/WindowsTest/windowstest.gypi',
], # includes
}], # build_with_chromium
], # conditions
}

27
src/voice_engine/main/source/voice_engine_core.gyp → src/voice_engine/main/source/voice_engine_core.gypi
View File

@ -7,30 +7,27 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'../../../common_settings.gypi',
],
'targets': [ 'targets': [
{ {
'target_name': 'voice_engine_core', 'target_name': 'voice_engine_core',
'type': '<(library)', 'type': '<(library)',
'dependencies': [ 'dependencies': [
'../../../common_audio/resampler/main/source/resampler.gyp:resampler', '<(webrtc_root)/common_audio/common_audio.gyp:resampler',
'../../../common_audio/signal_processing_library/main/source/spl.gyp:spl', '<(webrtc_root)/common_audio/common_audio.gyp:spl',
'../../../modules/audio_coding/main/source/audio_coding_module.gyp:audio_coding_module', '<(webrtc_root)/modules/modules.gyp:audio_coding_module',
'../../../modules/audio_conference_mixer/source/audio_conference_mixer.gyp:audio_conference_mixer', '<(webrtc_root)/modules/modules.gyp:audio_conference_mixer',
'../../../modules/audio_device/main/source/audio_device.gyp:audio_device', '<(webrtc_root)/modules/modules.gyp:audio_device',
'../../../modules/audio_processing/main/source/apm.gyp:audio_processing', '<(webrtc_root)/modules/modules.gyp:audio_processing',
'../../../modules/media_file/source/media_file.gyp:media_file', '<(webrtc_root)/modules/modules.gyp:media_file',
'../../../modules/rtp_rtcp/source/rtp_rtcp.gyp:rtp_rtcp', '<(webrtc_root)/modules/modules.gyp:rtp_rtcp',
'../../../modules/udp_transport/source/udp_transport.gyp:udp_transport', '<(webrtc_root)/modules/modules.gyp:udp_transport',
'../../../modules/utility/source/utility.gyp:webrtc_utility', '<(webrtc_root)/modules/modules.gyp:webrtc_utility',
'../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'include_dirs': [ 'include_dirs': [
'../../..', '../../..',
'../interface', '../interface',
'../../../modules/audio_device/main/source', '<(webrtc_root)/modules/audio_device/main/source',
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
'include_dirs': [ 'include_dirs': [

73
src/voice_engine.gyp → src/voice_engine/main/test/voice_engine_tests.gypi
View File

@ -7,9 +7,6 @@
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
{ {
'includes': [
'common_settings.gypi',
],
'variables': { 'variables': {
'autotest_name': 'voe_auto_test', 'autotest_name': 'voe_auto_test',
}, },
@ -30,7 +27,7 @@
'inputs': ['<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)<(autotest_name)<(EXECUTABLE_SUFFIX)'], 'inputs': ['<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)<(autotest_name)<(EXECUTABLE_SUFFIX)'],
'outputs': ['<(output_lib)'], 'outputs': ['<(output_lib)'],
'action': ['python', 'action': ['python',
'./build/merge_libs.py', '../build/merge_libs.py',
'<(PRODUCT_DIR)', '<(PRODUCT_DIR)',
'<(output_lib)'], '<(output_lib)'],
}, },
@ -41,27 +38,27 @@
'target_name': '<(autotest_name)', 'target_name': '<(autotest_name)',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'voice_engine/main/source/voice_engine_core.gyp:voice_engine_core', 'voice_engine_core',
'system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'include_dirs': [ 'include_dirs': [
'voice_engine/main/test/auto_test', 'auto_test',
'modules/interface', '<(webrtc_root)/modules/interface',
'modules/audio_device/main/interface', '<(webrtc_root)/modules/audio_device/main/interface',
], ],
'sources': [ 'sources': [
'voice_engine/main/test/auto_test/voe_cpu_test.cc', 'auto_test/voe_cpu_test.cc',
'voice_engine/main/test/auto_test/voe_cpu_test.h', 'auto_test/voe_cpu_test.h',
'voice_engine/main/test/auto_test/voe_extended_test.cc', 'auto_test/voe_extended_test.cc',
'voice_engine/main/test/auto_test/voe_extended_test.h', 'auto_test/voe_extended_test.h',
'voice_engine/main/test/auto_test/voe_standard_test.cc', 'auto_test/voe_standard_test.cc',
'voice_engine/main/test/auto_test/voe_standard_test.h', 'auto_test/voe_standard_test.h',
'voice_engine/main/test/auto_test/voe_stress_test.cc', 'auto_test/voe_stress_test.cc',
'voice_engine/main/test/auto_test/voe_stress_test.h', 'auto_test/voe_stress_test.h',
'voice_engine/main/test/auto_test/voe_test_defines.h', 'auto_test/voe_test_defines.h',
'voice_engine/main/test/auto_test/voe_test_interface.h', 'auto_test/voe_test_interface.h',
'voice_engine/main/test/auto_test/voe_unit_test.cc', 'auto_test/voe_unit_test.cc',
'voice_engine/main/test/auto_test/voe_unit_test.h', 'auto_test/voe_unit_test.h',
], ],
'conditions': [ 'conditions': [
['OS=="win"', { ['OS=="win"', {
@ -76,12 +73,12 @@
'target_name': 'voe_cmd_test', 'target_name': 'voe_cmd_test',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'../testing/gtest.gyp:gtest', '<(webrtc_root)/../testing/gtest.gyp:gtest',
'voice_engine/main/source/voice_engine_core.gyp:voice_engine_core', 'voice_engine_core',
'system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'sources': [ 'sources': [
'voice_engine/main/test/cmd_test/voe_cmd_test.cc', 'cmd_test/voe_cmd_test.cc',
], ],
}, },
], ],
@ -93,23 +90,23 @@
'target_name': 'voe_ui_win_test', 'target_name': 'voe_ui_win_test',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'voice_engine/main/source/voice_engine_core.gyp:voice_engine_core', 'voice_engine_core',
'system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'include_dirs': [ 'include_dirs': [
'voice_engine/main/test/win_test', 'win_test',
], ],
'sources': [ 'sources': [
'voice_engine/main/test/win_test/Resource.h', 'win_test/Resource.h',
'voice_engine/main/test/win_test/WinTest.cpp', 'win_test/WinTest.cpp',
'voice_engine/main/test/win_test/WinTest.h', 'win_test/WinTest.h',
'voice_engine/main/test/win_test/WinTest.rc', 'win_test/WinTest.rc',
'voice_engine/main/test/win_test/WinTestDlg.cpp', 'win_test/WinTestDlg.cpp',
'voice_engine/main/test/win_test/WinTestDlg.h', 'win_test/WinTestDlg.h',
'voice_engine/main/test/win_test/res/WinTest.ico', 'win_test/res/WinTest.ico',
'voice_engine/main/test/win_test/res/WinTest.rc2', 'win_test/res/WinTest.rc2',
'voice_engine/main/test/win_test/stdafx.cpp', 'win_test/stdafx.cpp',
'voice_engine/main/test/win_test/stdafx.h', 'win_test/stdafx.h',
], ],
'configurations': { 'configurations': {
'Common_Base': { 'Common_Base': {

23
src/voice_engine/voice_engine.gyp Normal file
View File

@ -0,0 +1,23 @@
# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{
'includes': [
'../common_settings.gypi', # Common settings
'main/source/voice_engine_core.gypi',
],
# Test targets, excluded when building with chromium.
'conditions': [
['build_with_chromium==0', {
'includes': [
'main/test/voice_engine_tests.gypi',
], # includes
}], # build_with_chromium
], # conditions
}

36
third_party_mods/libjingle/libjingle.gyp
View File

@ -530,22 +530,22 @@
}], }],
['inside_chromium_build==1', { ['inside_chromium_build==1', {
'dependencies': [ 'dependencies': [
'../../third_party/webrtc/modules/audio_device/main/source/audio_device.gyp:audio_device', '../../third_party/webrtc/modules/modules.gyp:audio_device',
'../../third_party/webrtc/modules/video_capture/main/source/video_capture.gyp:video_capture_module', '../../third_party/webrtc/modules/modules.gyp:video_capture_module',
'../../third_party/webrtc/modules/video_render/main/source/video_render.gyp:video_render_module', '../../third_party/webrtc/modules/modules.gyp:video_render_module',
'../../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers', '../../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'../../third_party/webrtc/video_engine/main/source/video_engine_core.gyp:video_engine_core', '../../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',
'../../third_party/webrtc/voice_engine/main/source/voice_engine_core.gyp:voice_engine_core', '../../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
'libjingle', 'libjingle',
], ],
}, { }, {
'dependencies': [ 'dependencies': [
'../../src/modules/audio_device/main/source/audio_device.gyp:audio_device', '../../src/modules/modules.gyp:audio_device',
'../../src/modules/video_capture/main/source/video_capture.gyp:video_capture_module', '../../src/modules/modules.gyp:video_capture_module',
'../../src/modules/video_render/main/source/video_render.gyp:video_render_module', '../../src/modules/modules.gyp:video_render_module',
'../../src/system_wrappers/source/system_wrappers.gyp:system_wrappers', '../../src/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'../../src/video_engine/main/source/video_engine_core.gyp:video_engine_core', '../../src/video_engine/video_engine.gyp:video_engine_core',
'../../src/voice_engine/main/source/voice_engine_core.gyp:voice_engine_core', '../../src/voice_engine/voice_engine.gyp:voice_engine_core',
'libjingle', 'libjingle',
], ],
} ], # inside_chromium_build } ], # inside_chromium_build
@ -578,19 +578,19 @@
'conditions': [ 'conditions': [
['inside_chromium_build==1', { ['inside_chromium_build==1', {
'dependencies': [ 'dependencies': [
'../../third_party/webrtc/modules/video_capture/main/source/video_capture.gyp:video_capture_module', '../../third_party/webrtc/modules/modules.gyp:video_capture_module',
'../../third_party/webrtc/modules/video_render/main/source/video_render.gyp:video_render_module', '../../third_party/webrtc/modules/modules.gyp:video_render_module',
'../../third_party/webrtc/video_engine/main/source/video_engine_core.gyp:video_engine_core', '../../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',
'../../third_party/webrtc/voice_engine/main/source/voice_engine_core.gyp:voice_engine_core', '../../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
'../../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers', '../../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'libjingle_p2p', 'libjingle_p2p',
], ],
}, { }, {
'dependencies': [ 'dependencies': [
'../../src/modules/video_capture/main/source/video_capture.gyp:video_capture_module', '../../src/modules/modules.gyp:video_capture_module',
'../../src/modules/video_render/main/source/video_render.gyp:video_render_module', '../../src/modules/modules.gyp:video_render_module',
'../../src/video_engine/main/source/video_engine_core.gyp:video_engine_core', '../../src/video_engine/video_engine.gyp:video_engine_core',
'../../src/voice_engine/main/source/voice_engine_core.gyp:voice_engine_core', '../../src/voice_engine/voice_engine.gyp:voice_engine_core',
'../../src/system_wrappers/source/system_wrappers.gyp:system_wrappers', '../../src/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'libjingle_p2p', 'libjingle_p2p',
], ],

6
webrtc.gyp
View File

@ -15,15 +15,15 @@
'target_name': 'auto_tests', 'target_name': 'auto_tests',
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
'src/voice_engine.gyp:voe_auto_test', 'src/voice_engine/voice_engine.gyp:voe_auto_test',
'src/video_engine.gyp:vie_auto_test', 'src/video_engine/video_engine.gyp:vie_auto_test',
], ],
}, },
{ {
'target_name': 'cmd_test', 'target_name': 'cmd_test',
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
'src/voice_engine.gyp:voe_cmd_test', 'src/voice_engine/voice_engine.gyp:voe_cmd_test',
], ],
}, },
{ {