From 1c2cf7bb04ad879c47d161d226dfd8caebf429e1 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Thu, 12 Dec 2013 17:19:27 -0500 Subject: [PATCH] Bug 939890 - Don't build iLBC/G722/iSAC audio codecs for webrtc. r=jesup --- .../main/source/audio_coding_module.gypi | 85 ++++++++++--------- .../modules/audio_coding/neteq4/neteq.gypi | 17 +++- media/webrtc/trunk/webrtc/modules/modules.gyp | 22 +++-- 3 files changed, 74 insertions(+), 50 deletions(-) diff --git a/media/webrtc/trunk/webrtc/modules/audio_coding/main/source/audio_coding_module.gypi b/media/webrtc/trunk/webrtc/modules/audio_coding/main/source/audio_coding_module.gypi index d5aae6beb37f..6b64ff0a76ac 100644 --- a/media/webrtc/trunk/webrtc/modules/audio_coding/main/source/audio_coding_module.gypi +++ b/media/webrtc/trunk/webrtc/modules/audio_coding/main/source/audio_coding_module.gypi @@ -19,57 +19,26 @@ ['include_opus==1', { 'audio_coding_dependencies': ['webrtc_opus',], 'audio_coding_defines': ['WEBRTC_CODEC_OPUS',], - 'audio_coding_sources': [ - 'acm_opus.cc', - 'acm_opus.h', - ], }], ['include_g711==1', { 'audio_coding_dependencies': ['G711',], 'audio_coding_defines': ['WEBRTC_CODEC_G711',], - 'audio_coding_sources': [ - 'acm_pcma.cc', - 'acm_pcma.h', - 'acm_pcmu.cc', - 'acm_pcmu.h', - ], }], ['include_g722==1', { 'audio_coding_dependencies': ['G722',], 'audio_coding_defines': ['WEBRTC_CODEC_G722',], - 'audio_coding_sources': [ - 'acm_g722.cc', - 'acm_g722.h', - 'acm_g7221.cc', - 'acm_g7221.h', - 'acm_g7221c.cc', - 'acm_g7221c.h', - ], }], ['include_ilbc==1', { 'audio_coding_dependencies': ['iLBC',], 'audio_coding_defines': ['WEBRTC_CODEC_ILBC',], - 'audio_coding_sources': [ - 'acm_ilbc.cc', - 'acm_ilbc.h', - ], }], ['include_isac==1', { 'audio_coding_dependencies': ['iSAC', 'iSACFix',], 'audio_coding_defines': ['WEBRTC_CODEC_ISAC', 'WEBRTC_CODEC_ISACFX',], - 'audio_coding_sources': [ - 'acm_isac.cc', - 'acm_isac.h', - 'acm_isac_macros.h', - ], }], ['include_pcm16b==1', { 'audio_coding_dependencies': ['PCM16B',], 'audio_coding_defines': ['WEBRTC_CODEC_PCM16',], - 'audio_coding_sources': [ - 'acm_pcm16b.cc', - 'acm_pcm16b.h', - ], }], ], }, @@ -95,7 +64,6 @@ ], }, 'sources': [ -# '<@(audio_coding_sources)', '../interface/audio_coding_module.h', '../interface/audio_coding_module_typedefs.h', 'acm_cng.cc', @@ -111,14 +79,6 @@ 'acm_neteq.cc', 'acm_neteq.h', # cheat until I get audio_coding_sources to work - 'acm_opus.cc', - 'acm_opus.h', - 'acm_pcm16b.cc', - 'acm_pcm16b.h', - 'acm_pcma.cc', - 'acm_pcma.h', - 'acm_pcmu.cc', - 'acm_pcmu.h', 'acm_red.cc', 'acm_red.h', 'acm_resampler.cc', @@ -128,6 +88,51 @@ 'nack.cc', 'nack.h', ], + 'conditions': [ + ['include_opus==1', { + 'sources': [ + 'acm_opus.cc', + 'acm_opus.h', + ], + }], + ['include_g711==1', { + 'sources': [ + 'acm_pcma.cc', + 'acm_pcma.h', + 'acm_pcmu.cc', + 'acm_pcmu.h', + ], + }], + ['include_g722==1', { + 'sources': [ + 'acm_g722.cc', + 'acm_g722.h', + 'acm_g7221.cc', + 'acm_g7221.h', + 'acm_g7221c.cc', + 'acm_g7221c.h', + ], + }], + ['include_ilbc==1', { + 'sources': [ + 'acm_ilbc.cc', + 'acm_ilbc.h', + ], + }], + ['include_isac==1', { + 'sources': [ + 'acm_isac.cc', + 'acm_isac.h', + 'acm_isac_macros.h', + ], + }], + ['include_pcm16b==1', { + 'sources': [ + 'acm_pcm16b.cc', + 'acm_pcm16b.h', + ], + }], + ], }, ], 'conditions': [ diff --git a/media/webrtc/trunk/webrtc/modules/audio_coding/neteq4/neteq.gypi b/media/webrtc/trunk/webrtc/modules/audio_coding/neteq4/neteq.gypi index e98178dfffe6..1f6af7820dcf 100644 --- a/media/webrtc/trunk/webrtc/modules/audio_coding/neteq4/neteq.gypi +++ b/media/webrtc/trunk/webrtc/modules/audio_coding/neteq4/neteq.gypi @@ -10,17 +10,25 @@ 'variables': { 'neteq_dependencies': [ 'G711', - 'G722', 'PCM16B', - 'iLBC', - 'iSAC', - 'iSACFix', 'CNG', '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', ], 'neteq_defines': [], 'conditions': [ + ['include_g722==1', { + 'neteq_dependencies': ['G722'], + 'neteq_defines': ['WEBRTC_CODEC_G722',], + }], + ['include_ilbc==1', { + 'neteq_dependencies': ['iLBC'], + 'neteq_defines': ['WEBRTC_CODEC_ILBC',], + }], + ['include_isac==1', { + 'neteq_dependencies': ['iSAC', 'iSACFix',], + 'neteq_defines': ['WEBRTC_CODEC_ISAC', 'WEBRTC_CODEC_ISACFIX',], + }], ['include_opus==1', { 'neteq_dependencies': ['webrtc_opus',], 'neteq_defines': ['WEBRTC_CODEC_OPUS',], @@ -127,6 +135,7 @@ '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', '<(webrtc_root)/test/test.gyp:test_support_main', ], +# FIX for include_isac/etc 'defines': [ 'AUDIO_DECODER_UNITTEST', 'WEBRTC_CODEC_G722', diff --git a/media/webrtc/trunk/webrtc/modules/modules.gyp b/media/webrtc/trunk/webrtc/modules/modules.gyp index 5dab6f7cd27a..2f84cd60aa61 100644 --- a/media/webrtc/trunk/webrtc/modules/modules.gyp +++ b/media/webrtc/trunk/webrtc/modules/modules.gyp @@ -11,10 +11,6 @@ '../build/common.gypi', 'audio_coding/codecs/cng/cng.gypi', 'audio_coding/codecs/g711/g711.gypi', - 'audio_coding/codecs/g722/g722.gypi', - 'audio_coding/codecs/ilbc/ilbc.gypi', - 'audio_coding/codecs/isac/main/source/isac.gypi', - 'audio_coding/codecs/isac/fix/source/isacfix.gypi', 'audio_coding/codecs/pcm16b/pcm16b.gypi', 'audio_coding/main/source/audio_coding_module.gypi', 'audio_coding/neteq/neteq.gypi', @@ -36,13 +32,21 @@ 'video_render/video_render.gypi', ], 'conditions': [ + ['include_g722==1', { + 'includes': ['audio_coding/codecs/g722/g722.gypi',], + }], + ['include_ilbc==1', { + 'includes': ['audio_coding/codecs/ilbc/ilbc.gypi',], + }], + ['include_isac==1', { + 'includes': ['audio_coding/codecs/isac/main/source/isac.gypi', + 'audio_coding/codecs/isac/fix/source/isacfix.gypi',], + }], ['include_opus==1', { 'includes': ['audio_coding/codecs/opus/opus.gypi',], }], ['include_tests==1', { 'includes': [ - 'audio_coding/codecs/isac/isac_test.gypi', - 'audio_coding/codecs/isac/isacfix_test.gypi', 'audio_processing/audio_processing_tests.gypi', 'rtp_rtcp/test/testFec/test_fec.gypi', 'video_coding/main/source/video_coding_test.gypi', @@ -50,6 +54,12 @@ 'video_coding/codecs/test_framework/test_framework.gypi', 'video_coding/codecs/tools/video_codecs_tools.gypi', ], # includes + 'conditions': [ + ['include_isac==1', { + 'includes': ['audio_coding/codecs/isac/isac_test.gypi', + 'audio_coding/codecs/isac/isacfix_test.gypi',], + }], + ], 'variables': { 'conditions': [ # Desktop capturer is supported only on Windows, OSX and Linux.