Move isacfix.gypi and isac.gypi
Move webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi and webrtc/modules/audio_coding/codecs/isac/main/source/isac.gypi to webrtc/modules/audio_coding/codecs/isac to pass recently added _CheckNoSourcesAboveGyp presubmit rule. BUG=4002 R=tina.legrand@webrtc.org Review URL: https://webrtc-codereview.appspot.com/37269004 Cr-Commit-Position: refs/heads/master@{#8376} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8376 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org
parent
0200f70792
commit
e35fa96cbe
@ -14,8 +14,8 @@
|
||||
'codecs/g711/g711.gypi',
|
||||
'codecs/g722/g722.gypi',
|
||||
'codecs/ilbc/ilbc.gypi',
|
||||
'codecs/isac/main/source/isac.gypi',
|
||||
'codecs/isac/fix/source/isacfix.gypi',
|
||||
'codecs/isac/isac.gypi',
|
||||
'codecs/isac/isacfix.gypi',
|
||||
'codecs/pcm16b/pcm16b.gypi',
|
||||
'codecs/red/red.gypi',
|
||||
'main/acm2/audio_coding_module.gypi',
|
||||
|
||||
@ -1,160 +0,0 @@
|
||||
# Copyright (c) 2012 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': 'iSACFix',
|
||||
'type': 'static_library',
|
||||
'dependencies': [
|
||||
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
|
||||
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
|
||||
],
|
||||
'include_dirs': [
|
||||
'../interface',
|
||||
'<(webrtc_root)'
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
'include_dirs': [
|
||||
'../interface',
|
||||
'<(webrtc_root)',
|
||||
],
|
||||
},
|
||||
'sources': [
|
||||
'../../audio_encoder_isac_t.h',
|
||||
'../../audio_encoder_isac_t_impl.h',
|
||||
'../interface/audio_encoder_isacfix.h',
|
||||
'../interface/isacfix.h',
|
||||
'arith_routines.c',
|
||||
'arith_routines_hist.c',
|
||||
'arith_routines_logist.c',
|
||||
'audio_encoder_isacfix.cc',
|
||||
'bandwidth_estimator.c',
|
||||
'decode.c',
|
||||
'decode_bwe.c',
|
||||
'decode_plc.c',
|
||||
'encode.c',
|
||||
'entropy_coding.c',
|
||||
'fft.c',
|
||||
'filterbank_tables.c',
|
||||
'filterbanks.c',
|
||||
'filters.c',
|
||||
'initialize.c',
|
||||
'isacfix.c',
|
||||
'lattice.c',
|
||||
'lattice_c.c',
|
||||
'lpc_masking_model.c',
|
||||
'lpc_tables.c',
|
||||
'pitch_estimator.c',
|
||||
'pitch_estimator_c.c',
|
||||
'pitch_filter.c',
|
||||
'pitch_filter_c.c',
|
||||
'pitch_gain_tables.c',
|
||||
'pitch_lag_tables.c',
|
||||
'spectrum_ar_model_tables.c',
|
||||
'transform.c',
|
||||
'transform_tables.c',
|
||||
'arith_routins.h',
|
||||
'bandwidth_estimator.h',
|
||||
'codec.h',
|
||||
'entropy_coding.h',
|
||||
'fft.h',
|
||||
'filterbank_tables.h',
|
||||
'lpc_masking_model.h',
|
||||
'lpc_tables.h',
|
||||
'pitch_estimator.h',
|
||||
'pitch_gain_tables.h',
|
||||
'pitch_lag_tables.h',
|
||||
'settings.h',
|
||||
'spectrum_ar_model_tables.h',
|
||||
'structs.h',
|
||||
],
|
||||
'conditions': [
|
||||
['OS!="win"', {
|
||||
'defines': [
|
||||
'WEBRTC_LINUX',
|
||||
],
|
||||
}],
|
||||
['target_arch=="arm" and arm_version>=7', {
|
||||
'dependencies': [ 'isac_neon', ],
|
||||
'sources': [
|
||||
'lattice_armv7.S',
|
||||
'pitch_filter_armv6.S',
|
||||
],
|
||||
'sources!': [
|
||||
'lattice_c.c',
|
||||
'pitch_filter_c.c',
|
||||
],
|
||||
}],
|
||||
['target_arch=="mipsel" and mips_arch_variant!="r6" and android_webview_build==0', {
|
||||
'sources': [
|
||||
'entropy_coding_mips.c',
|
||||
'filters_mips.c',
|
||||
'lattice_mips.c',
|
||||
'pitch_estimator_mips.c',
|
||||
'transform_mips.c',
|
||||
],
|
||||
'sources!': [
|
||||
'lattice_c.c',
|
||||
'pitch_estimator_c.c',
|
||||
],
|
||||
'conditions': [
|
||||
['mips_dsp_rev>0', {
|
||||
'sources': [
|
||||
'filterbanks_mips.c',
|
||||
],
|
||||
}],
|
||||
['mips_dsp_rev>1', {
|
||||
'sources': [
|
||||
'lpc_masking_model_mips.c',
|
||||
'pitch_filter_mips.c',
|
||||
],
|
||||
'sources!': [
|
||||
'pitch_filter_c.c',
|
||||
],
|
||||
}],
|
||||
],
|
||||
}],
|
||||
],
|
||||
},
|
||||
],
|
||||
'conditions': [
|
||||
['target_arch=="arm" and arm_version>=7', {
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'isac_neon',
|
||||
'type': 'static_library',
|
||||
'includes': ['../../../../../../build/arm_neon.gypi',],
|
||||
'dependencies': [
|
||||
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
|
||||
],
|
||||
'include_dirs': [
|
||||
'<(webrtc_root)',
|
||||
],
|
||||
'sources': [
|
||||
'entropy_coding_neon.c',
|
||||
'filterbanks_neon.S',
|
||||
'filters_neon.S',
|
||||
'lattice_neon.S',
|
||||
'lpc_masking_model_neon.S',
|
||||
'transform_neon.S',
|
||||
],
|
||||
'conditions': [
|
||||
# Disable LTO in isac_neon target due to compiler bug
|
||||
['use_lto==1', {
|
||||
'cflags!': [
|
||||
'-flto',
|
||||
'-ffat-lto-objects',
|
||||
],
|
||||
}],
|
||||
],
|
||||
},
|
||||
],
|
||||
}],
|
||||
],
|
||||
}
|
||||
93
webrtc/modules/audio_coding/codecs/isac/isac.gypi
Normal file
93
webrtc/modules/audio_coding/codecs/isac/isac.gypi
Normal file
@ -0,0 +1,93 @@
|
||||
# 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': 'iSAC',
|
||||
'type': 'static_library',
|
||||
'dependencies': [
|
||||
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
|
||||
'audio_decoder_interface',
|
||||
'audio_encoder_interface',
|
||||
],
|
||||
'include_dirs': [
|
||||
'main/interface',
|
||||
'<(webrtc_root)',
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
'include_dirs': [
|
||||
'main/interface',
|
||||
'<(webrtc_root)',
|
||||
],
|
||||
},
|
||||
'sources': [
|
||||
'audio_encoder_isac_t.h',
|
||||
'audio_encoder_isac_t_impl.h',
|
||||
'main/interface/audio_encoder_isac.h',
|
||||
'main/interface/isac.h',
|
||||
'main/source/arith_routines.c',
|
||||
'main/source/arith_routines_hist.c',
|
||||
'main/source/arith_routines_logist.c',
|
||||
'main/source/audio_encoder_isac.cc',
|
||||
'main/source/bandwidth_estimator.c',
|
||||
'main/source/crc.c',
|
||||
'main/source/decode.c',
|
||||
'main/source/decode_bwe.c',
|
||||
'main/source/encode.c',
|
||||
'main/source/encode_lpc_swb.c',
|
||||
'main/source/entropy_coding.c',
|
||||
'main/source/fft.c',
|
||||
'main/source/filter_functions.c',
|
||||
'main/source/filterbank_tables.c',
|
||||
'main/source/intialize.c',
|
||||
'main/source/isac.c',
|
||||
'main/source/filterbanks.c',
|
||||
'main/source/pitch_lag_tables.c',
|
||||
'main/source/lattice.c',
|
||||
'main/source/lpc_gain_swb_tables.c',
|
||||
'main/source/lpc_analysis.c',
|
||||
'main/source/lpc_shape_swb12_tables.c',
|
||||
'main/source/lpc_shape_swb16_tables.c',
|
||||
'main/source/lpc_tables.c',
|
||||
'main/source/pitch_estimator.c',
|
||||
'main/source/pitch_filter.c',
|
||||
'main/source/pitch_gain_tables.c',
|
||||
'main/source/spectrum_ar_model_tables.c',
|
||||
'main/source/transform.c',
|
||||
'main/source/arith_routines.h',
|
||||
'main/source/bandwidth_estimator.h',
|
||||
'main/source/codec.h',
|
||||
'main/source/crc.h',
|
||||
'main/source/encode_lpc_swb.h',
|
||||
'main/source/entropy_coding.h',
|
||||
'main/source/fft.h',
|
||||
'main/source/filterbank_tables.h',
|
||||
'main/source/lpc_gain_swb_tables.h',
|
||||
'main/source/lpc_analysis.h',
|
||||
'main/source/lpc_shape_swb12_tables.h',
|
||||
'main/source/lpc_shape_swb16_tables.h',
|
||||
'main/source/lpc_tables.h',
|
||||
'main/source/pitch_estimator.h',
|
||||
'main/source/pitch_gain_tables.h',
|
||||
'main/source/pitch_lag_tables.h',
|
||||
'main/source/settings.h',
|
||||
'main/source/spectrum_ar_model_tables.h',
|
||||
'main/source/structs.h',
|
||||
'main/source/os_specific_inline.h',
|
||||
],
|
||||
'conditions': [
|
||||
['OS=="linux"', {
|
||||
'link_settings': {
|
||||
'libraries': ['-lm',],
|
||||
},
|
||||
}],
|
||||
],
|
||||
},
|
||||
],
|
||||
}
|
||||
160
webrtc/modules/audio_coding/codecs/isac/isacfix.gypi
Normal file
160
webrtc/modules/audio_coding/codecs/isac/isacfix.gypi
Normal file
@ -0,0 +1,160 @@
|
||||
# Copyright (c) 2012 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': 'iSACFix',
|
||||
'type': 'static_library',
|
||||
'dependencies': [
|
||||
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
|
||||
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
|
||||
],
|
||||
'include_dirs': [
|
||||
'fix/interface',
|
||||
'<(webrtc_root)'
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
'include_dirs': [
|
||||
'fix/interface',
|
||||
'<(webrtc_root)',
|
||||
],
|
||||
},
|
||||
'sources': [
|
||||
'audio_encoder_isac_t.h',
|
||||
'audio_encoder_isac_t_impl.h',
|
||||
'fix/interface/audio_encoder_isacfix.h',
|
||||
'fix/interface/isacfix.h',
|
||||
'fix/source/arith_routines.c',
|
||||
'fix/source/arith_routines_hist.c',
|
||||
'fix/source/arith_routines_logist.c',
|
||||
'fix/source/audio_encoder_isacfix.cc',
|
||||
'fix/source/bandwidth_estimator.c',
|
||||
'fix/source/decode.c',
|
||||
'fix/source/decode_bwe.c',
|
||||
'fix/source/decode_plc.c',
|
||||
'fix/source/encode.c',
|
||||
'fix/source/entropy_coding.c',
|
||||
'fix/source/fft.c',
|
||||
'fix/source/filterbank_tables.c',
|
||||
'fix/source/filterbanks.c',
|
||||
'fix/source/filters.c',
|
||||
'fix/source/initialize.c',
|
||||
'fix/source/isacfix.c',
|
||||
'fix/source/lattice.c',
|
||||
'fix/source/lattice_c.c',
|
||||
'fix/source/lpc_masking_model.c',
|
||||
'fix/source/lpc_tables.c',
|
||||
'fix/source/pitch_estimator.c',
|
||||
'fix/source/pitch_estimator_c.c',
|
||||
'fix/source/pitch_filter.c',
|
||||
'fix/source/pitch_filter_c.c',
|
||||
'fix/source/pitch_gain_tables.c',
|
||||
'fix/source/pitch_lag_tables.c',
|
||||
'fix/source/spectrum_ar_model_tables.c',
|
||||
'fix/source/transform.c',
|
||||
'fix/source/transform_tables.c',
|
||||
'fix/source/arith_routins.h',
|
||||
'fix/source/bandwidth_estimator.h',
|
||||
'fix/source/codec.h',
|
||||
'fix/source/entropy_coding.h',
|
||||
'fix/source/fft.h',
|
||||
'fix/source/filterbank_tables.h',
|
||||
'fix/source/lpc_masking_model.h',
|
||||
'fix/source/lpc_tables.h',
|
||||
'fix/source/pitch_estimator.h',
|
||||
'fix/source/pitch_gain_tables.h',
|
||||
'fix/source/pitch_lag_tables.h',
|
||||
'fix/source/settings.h',
|
||||
'fix/source/spectrum_ar_model_tables.h',
|
||||
'fix/source/structs.h',
|
||||
],
|
||||
'conditions': [
|
||||
['OS!="win"', {
|
||||
'defines': [
|
||||
'WEBRTC_LINUX',
|
||||
],
|
||||
}],
|
||||
['target_arch=="arm" and arm_version>=7', {
|
||||
'dependencies': [ 'isac_neon', ],
|
||||
'sources': [
|
||||
'fix/source/lattice_armv7.S',
|
||||
'fix/source/pitch_filter_armv6.S',
|
||||
],
|
||||
'sources!': [
|
||||
'fix/source/lattice_c.c',
|
||||
'fix/source/pitch_filter_c.c',
|
||||
],
|
||||
}],
|
||||
['target_arch=="mipsel" and mips_arch_variant!="r6" and android_webview_build==0', {
|
||||
'sources': [
|
||||
'fix/source/entropy_coding_mips.c',
|
||||
'fix/source/filters_mips.c',
|
||||
'fix/source/lattice_mips.c',
|
||||
'fix/source/pitch_estimator_mips.c',
|
||||
'fix/source/transform_mips.c',
|
||||
],
|
||||
'sources!': [
|
||||
'fix/source/lattice_c.c',
|
||||
'fix/source/pitch_estimator_c.c',
|
||||
],
|
||||
'conditions': [
|
||||
['mips_dsp_rev>0', {
|
||||
'sources': [
|
||||
'fix/source/filterbanks_mips.c',
|
||||
],
|
||||
}],
|
||||
['mips_dsp_rev>1', {
|
||||
'sources': [
|
||||
'fix/source/lpc_masking_model_mips.c',
|
||||
'fix/source/pitch_filter_mips.c',
|
||||
],
|
||||
'sources!': [
|
||||
'fix/source/pitch_filter_c.c',
|
||||
],
|
||||
}],
|
||||
],
|
||||
}],
|
||||
],
|
||||
},
|
||||
],
|
||||
'conditions': [
|
||||
['target_arch=="arm" and arm_version>=7', {
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'isac_neon',
|
||||
'type': 'static_library',
|
||||
'includes': ['../../../../build/arm_neon.gypi',],
|
||||
'dependencies': [
|
||||
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
|
||||
],
|
||||
'include_dirs': [
|
||||
'<(webrtc_root)',
|
||||
],
|
||||
'sources': [
|
||||
'fix/source/entropy_coding_neon.c',
|
||||
'fix/source/filterbanks_neon.S',
|
||||
'fix/source/filters_neon.S',
|
||||
'fix/source/lattice_neon.S',
|
||||
'fix/source/lpc_masking_model_neon.S',
|
||||
'fix/source/transform_neon.S',
|
||||
],
|
||||
'conditions': [
|
||||
# Disable LTO in isac_neon target due to compiler bug
|
||||
['use_lto==1', {
|
||||
'cflags!': [
|
||||
'-flto',
|
||||
'-ffat-lto-objects',
|
||||
],
|
||||
}],
|
||||
],
|
||||
},
|
||||
],
|
||||
}],
|
||||
],
|
||||
}
|
||||
@ -1,93 +0,0 @@
|
||||
# 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': 'iSAC',
|
||||
'type': 'static_library',
|
||||
'dependencies': [
|
||||
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
|
||||
'audio_decoder_interface',
|
||||
'audio_encoder_interface',
|
||||
],
|
||||
'include_dirs': [
|
||||
'../interface',
|
||||
'<(webrtc_root)',
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
'include_dirs': [
|
||||
'../interface',
|
||||
'<(webrtc_root)',
|
||||
],
|
||||
},
|
||||
'sources': [
|
||||
'../../audio_encoder_isac_t.h',
|
||||
'../../audio_encoder_isac_t_impl.h',
|
||||
'../interface/audio_encoder_isac.h',
|
||||
'../interface/isac.h',
|
||||
'arith_routines.c',
|
||||
'arith_routines_hist.c',
|
||||
'arith_routines_logist.c',
|
||||
'audio_encoder_isac.cc',
|
||||
'bandwidth_estimator.c',
|
||||
'crc.c',
|
||||
'decode.c',
|
||||
'decode_bwe.c',
|
||||
'encode.c',
|
||||
'encode_lpc_swb.c',
|
||||
'entropy_coding.c',
|
||||
'fft.c',
|
||||
'filter_functions.c',
|
||||
'filterbank_tables.c',
|
||||
'intialize.c',
|
||||
'isac.c',
|
||||
'filterbanks.c',
|
||||
'pitch_lag_tables.c',
|
||||
'lattice.c',
|
||||
'lpc_gain_swb_tables.c',
|
||||
'lpc_analysis.c',
|
||||
'lpc_shape_swb12_tables.c',
|
||||
'lpc_shape_swb16_tables.c',
|
||||
'lpc_tables.c',
|
||||
'pitch_estimator.c',
|
||||
'pitch_filter.c',
|
||||
'pitch_gain_tables.c',
|
||||
'spectrum_ar_model_tables.c',
|
||||
'transform.c',
|
||||
'arith_routines.h',
|
||||
'bandwidth_estimator.h',
|
||||
'codec.h',
|
||||
'crc.h',
|
||||
'encode_lpc_swb.h',
|
||||
'entropy_coding.h',
|
||||
'fft.h',
|
||||
'filterbank_tables.h',
|
||||
'lpc_gain_swb_tables.h',
|
||||
'lpc_analysis.h',
|
||||
'lpc_shape_swb12_tables.h',
|
||||
'lpc_shape_swb16_tables.h',
|
||||
'lpc_tables.h',
|
||||
'pitch_estimator.h',
|
||||
'pitch_gain_tables.h',
|
||||
'pitch_lag_tables.h',
|
||||
'settings.h',
|
||||
'spectrum_ar_model_tables.h',
|
||||
'structs.h',
|
||||
'os_specific_inline.h',
|
||||
],
|
||||
'conditions': [
|
||||
['OS=="linux"', {
|
||||
'link_settings': {
|
||||
'libraries': ['-lm',],
|
||||
},
|
||||
}],
|
||||
],
|
||||
},
|
||||
],
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user