Chromium Code Reviews| Index: media/media.gyp |
| diff --git a/media/media.gyp b/media/media.gyp |
| index 43050971251d0f7ba198b5e5af4b3e3d4c475161..4ae8afc293425e0bca983d5f8526e463b895f8cc 100644 |
| --- a/media/media.gyp |
| +++ b/media/media.gyp |
| @@ -12,12 +12,12 @@ |
| # detection of ABI mismatches and prevents silent errors. |
| 'linux_link_pulseaudio%': 0, |
| 'conditions': [ |
| - ['OS == "android" or OS == "ios"', { |
| + ['OS=="android" or OS=="ios"', { |
| # Android and iOS don't use ffmpeg. |
| 'media_use_ffmpeg%': 0, |
| # Android and iOS don't use libvpx. |
| 'media_use_libvpx%': 0, |
| - }, { # 'OS != "android" and OS != "ios"' |
| + }, { # 'OS!="android" and OS!="ios"' |
| 'media_use_ffmpeg%': 1, |
| 'media_use_libvpx%': 1, |
| }], |
| @@ -33,7 +33,7 @@ |
| }, { |
| 'use_alsa%': 0, |
| }], |
| - ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and chromeos != 1', { |
| + ['os_posix==1 and OS!="mac" and OS!="ios" and OS!="android" and chromeos!=1', { |
| 'use_pulseaudio%': 1, |
| }, { |
| 'use_pulseaudio%': 0, |
| @@ -281,6 +281,14 @@ |
| 'base/seekable_buffer.h', |
| 'base/serial_runner.cc', |
| 'base/serial_runner.h', |
| + 'base/simd/convert_rgb_to_yuv.h', |
| + 'base/simd/convert_rgb_to_yuv_c.cc', |
| + 'base/simd/convert_yuv_to_rgb.h', |
| + 'base/simd/convert_yuv_to_rgb_c.cc', |
| + 'base/simd/filter_yuv.h', |
| + 'base/simd/filter_yuv_c.cc', |
| + 'base/simd/yuv_to_rgb_table.cc', |
| + 'base/simd/yuv_to_rgb_table.h', |
| 'base/sinc_resampler.cc', |
| 'base/sinc_resampler.h', |
| 'base/stream_parser.cc', |
| @@ -297,6 +305,8 @@ |
| 'base/video_renderer.h', |
| 'base/video_util.cc', |
| 'base/video_util.h', |
| + 'base/yuv_convert.cc', |
| + 'base/yuv_convert.h', |
| 'crypto/aes_decryptor.cc', |
| 'crypto/aes_decryptor.h', |
| 'ffmpeg/ffmpeg_common.cc', |
| @@ -450,28 +460,27 @@ |
| ], |
| }, |
| 'conditions': [ |
| - ['arm_neon == 1', { |
| + ['arm_neon==1', { |
| 'defines': [ |
| 'USE_NEON' |
| ], |
| }], |
| - ['OS != "linux" or use_x11 == 1', { |
| + ['OS!="linux" or use_x11==1', { |
| 'sources!': [ |
| 'video/capture/screen/screen_capturer_null.cc', |
| ] |
| }], |
| - ['OS != "ios"', { |
| + ['OS!="ios"', { |
| 'dependencies': [ |
| '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', |
| 'shared_memory_support', |
|
Ami GONE FROM CHROMIUM
2013/05/18 02:22:04
So does this now need a sources! of the yuv_conver
DaleCurtis
2013/05/23 23:43:23
Nope, iOS excludes .* and then readds what it need
|
| - 'yuv_convert', |
| ], |
| }], |
| - ['media_use_ffmpeg == 1', { |
| + ['media_use_ffmpeg==1', { |
| 'dependencies': [ |
| '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', |
| ], |
| - }, { # media_use_ffmpeg == 0 |
| + }, { # media_use_ffmpeg==0 |
| # Exclude the sources that depend on ffmpeg. |
| 'sources!': [ |
| 'base/media_posix.cc', |
| @@ -493,11 +502,11 @@ |
| 'filters/ffmpeg_video_decoder.h', |
| ], |
| }], |
| - ['media_use_libvpx == 1', { |
| + ['media_use_libvpx==1', { |
| 'dependencies': [ |
| '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx', |
| ], |
| - }, { # media_use_libvpx == 0 |
| + }, { # media_use_libvpx==0 |
| 'direct_dependent_settings': { |
| 'defines': [ |
| 'MEDIA_DISABLE_LIBVPX', |
| @@ -509,7 +518,7 @@ |
| 'filters/vpx_video_decoder.h', |
| ], |
| }], |
| - ['OS == "ios"', { |
| + ['OS=="ios"', { |
| 'includes': [ |
| # For shared_memory_support_sources variable. |
| 'shared_memory_support.gypi', |
| @@ -551,7 +560,7 @@ |
| ], |
| }, |
| }], |
| - ['OS == "android"', { |
| + ['OS=="android"', { |
| 'link_settings': { |
| 'libraries': [ |
| '-lOpenSLES', |
| @@ -570,7 +579,7 @@ |
| 'base/media.h', |
| ], |
| 'conditions': [ |
| - ['android_webview_build == 0', { |
| + ['android_webview_build==0', { |
| 'dependencies': [ |
| 'media_java', |
| ], |
| @@ -611,8 +620,8 @@ |
| ], |
| }, |
| }, { # use_alsa==0 |
| - 'sources/': [ ['exclude', '/alsa_' ], |
| - ['exclude', '/audio_manager_linux' ] ], |
| + 'sources/': [ ['exclude', '/alsa_'], |
| + ['exclude', '/audio_manager_linux'] ], |
| }], |
| ['OS!="openbsd"', { |
| 'sources!': [ |
| @@ -631,7 +640,7 @@ |
| ], |
| }, |
| 'conditions': [ |
| - ['use_x11 == 1', { |
| + ['use_x11==1', { |
| 'link_settings': { |
| 'libraries': [ |
| '-lX11', |
| @@ -641,7 +650,7 @@ |
| ], |
| }, |
| }], |
| - ['use_cras == 1', { |
| + ['use_cras==1', { |
| 'cflags': [ |
| '<!@(<(pkg-config) --cflags libcras)', |
| ], |
| @@ -653,7 +662,7 @@ |
| 'defines': [ |
| 'USE_CRAS', |
| ], |
| - }, { # else: use_cras == 0 |
| + }, { # else: use_cras==0 |
| 'sources!': [ |
| 'audio/cras/audio_manager_cras.cc', |
| 'audio/cras/audio_manager_cras.h', |
| @@ -728,7 +737,7 @@ |
| ], |
| 'conditions': [ |
| # Linux/Solaris need libdl for dlopen() and friends. |
| - ['OS == "linux" or OS == "solaris"', { |
| + ['OS=="linux" or OS=="solaris"', { |
| 'link_settings': { |
| 'libraries': [ |
| '-ldl', |
| @@ -761,7 +770,7 @@ |
| 'audio/pulse/pulse_util.h', |
| ], |
| }], |
| - ['os_posix == 1', { |
| + ['os_posix==1', { |
| 'sources!': [ |
| 'video/capture/video_capture_device_dummy.cc', |
| 'video/capture/video_capture_device_dummy.h', |
| @@ -817,7 +826,7 @@ |
| # TODO(wolenetz): Fix size_t to int truncations in win64. See |
| # http://crbug.com/171009 |
| 'conditions': [ |
| - ['target_arch == "x64"', { |
| + ['target_arch=="x64"', { |
| 'msvs_disabled_warnings': [ 4267, ], |
| }], |
| ], |
| @@ -844,7 +853,7 @@ |
| 'mp4/track_run_iterator.h', |
| ], |
| }], |
| - [ 'screen_capture_supported==1', { |
| + ['screen_capture_supported==1', { |
| 'dependencies': [ |
| '../third_party/webrtc/modules/modules.gyp:desktop_capture', |
| ], |
| @@ -853,30 +862,31 @@ |
| ['exclude', '^video/capture/screen/'], |
| ], |
| }], |
| - [ 'screen_capture_supported==1 and (target_arch=="ia32" or target_arch=="x64")', { |
| - 'dependencies': [ |
| - 'differ_block_sse2', |
| - ], |
| - }], |
| ['toolkit_uses_gtk==1', { |
| 'dependencies': [ |
| '../build/linux/system.gyp:gtk', |
| ], |
| }], |
| # ios check is necessary due to http://crbug.com/172682. |
| - ['OS != "ios" and (target_arch == "ia32" or target_arch == "x64")', { |
| + ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64")', { |
| 'dependencies': [ |
| + 'media_asm', |
| + 'media_mmx', |
| 'media_sse', |
| + 'media_sse2', |
| + ], |
| + 'sources': [ |
| + 'base/simd/convert_yuv_to_rgb_x86.cc', |
| ], |
| }], |
| - ['google_tv == 1', { |
| + ['google_tv==1', { |
| 'defines': [ |
| 'ENABLE_EAC3_PLAYBACK', |
| ], |
| }], |
| ], |
| 'target_conditions': [ |
| - ['OS == "ios"', { |
| + ['OS=="ios"', { |
| 'sources/': [ |
| # Pull in specific Mac files for iOS (which have been filtered out |
| # by file name rules). |
| @@ -1004,18 +1014,17 @@ |
| 'webm/webm_tracks_parser_unittest.cc', |
| ], |
| 'conditions': [ |
| - ['arm_neon == 1', { |
| + ['arm_neon==1', { |
| 'defines': [ |
| 'USE_NEON' |
| ], |
| }], |
| - ['OS != "ios"', { |
| + ['OS!="ios"', { |
| 'dependencies': [ |
| 'shared_memory_support', |
| - 'yuv_convert', |
| ], |
| }], |
| - ['media_use_ffmpeg == 1', { |
| + ['media_use_ffmpeg==1', { |
| 'dependencies': [ |
| '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', |
| ], |
| @@ -1029,7 +1038,7 @@ |
| }], |
| ], |
| }], |
| - ['OS == "ios"', { |
| + ['OS=="ios"', { |
| 'sources/': [ |
| ['exclude', '.*'], |
| ['include', '^audio/audio_input_controller_unittest\\.cc$'], |
| @@ -1060,7 +1069,7 @@ |
| 'webm/webm_cluster_parser_unittest.cc', |
| ], |
| 'conditions': [ |
| - ['gtest_target_type == "shared_library"', { |
| + ['gtest_target_type=="shared_library"', { |
| 'dependencies': [ |
| '../testing/android/native_test.gyp:native_test_native_code', |
| 'player_android', |
| @@ -1068,9 +1077,9 @@ |
| }], |
| ], |
| }], |
| - ['OS == "linux"', { |
| + ['OS=="linux"', { |
| 'conditions': [ |
| - ['use_cras == 1', { |
| + ['use_cras==1', { |
| 'sources': [ |
| 'audio/cras/cras_input_unittest.cc', |
| 'audio/cras/cras_unified_unittest.cc', |
| @@ -1087,13 +1096,10 @@ |
| 'audio/audio_low_latency_input_output_unittest.cc', |
| ], |
| }], |
| - ['OS != "ios" and (target_arch=="ia32" or target_arch=="x64")', { |
| + ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64")', { |
| 'sources': [ |
| 'base/simd/convert_rgb_to_yuv_unittest.cc', |
| ], |
| - 'dependencies': [ |
| - 'media_sse', |
| - ], |
| }], |
| ['screen_capture_supported==1', { |
| 'dependencies': [ |
| @@ -1154,7 +1160,7 @@ |
| 'video/capture/screen/screen_capturer_mock_objects.h', |
| ], |
| 'conditions': [ |
| - [ 'screen_capture_supported == 1', { |
| + ['screen_capture_supported==1', { |
| 'dependencies': [ |
| '../third_party/webrtc/modules/modules.gyp:desktop_capture', |
| ], |
| @@ -1167,75 +1173,39 @@ |
| }, |
| ], |
| 'conditions': [ |
| - ['OS != "ios" and target_arch != "arm"', { |
| + ['OS!="ios" and target_arch!="arm"', { |
| 'targets': [ |
| - { |
| - 'target_name': 'yuv_convert_simd_x86', |
| + { |
| + 'target_name': 'media_asm', |
| 'type': 'static_library', |
| - 'include_dirs': [ |
| - '..', |
| - ], |
| 'sources': [ |
| - 'base/simd/convert_rgb_to_yuv_c.cc', |
| - 'base/simd/convert_rgb_to_yuv_sse2.cc', |
| 'base/simd/convert_rgb_to_yuv_ssse3.asm', |
| - 'base/simd/convert_rgb_to_yuv_ssse3.cc', |
| - 'base/simd/convert_rgb_to_yuv_ssse3.inc', |
| - 'base/simd/convert_yuv_to_rgb_c.cc', |
| 'base/simd/convert_yuv_to_rgb_mmx.asm', |
| - 'base/simd/convert_yuv_to_rgb_mmx.inc', |
| 'base/simd/convert_yuv_to_rgb_sse.asm', |
| - 'base/simd/convert_yuv_to_rgb_x86.cc', |
| 'base/simd/convert_yuva_to_argb_mmx.asm', |
| - 'base/simd/convert_yuva_to_argb_mmx.inc', |
| 'base/simd/empty_register_state_mmx.asm', |
| - 'base/simd/filter_yuv.h', |
| - 'base/simd/filter_yuv_c.cc', |
| - 'base/simd/filter_yuv_sse2.cc', |
| 'base/simd/linear_scale_yuv_to_rgb_mmx.asm', |
| - 'base/simd/linear_scale_yuv_to_rgb_mmx.inc', |
| 'base/simd/linear_scale_yuv_to_rgb_sse.asm', |
| 'base/simd/scale_yuv_to_rgb_mmx.asm', |
| - 'base/simd/scale_yuv_to_rgb_mmx.inc', |
| 'base/simd/scale_yuv_to_rgb_sse.asm', |
| - 'base/simd/yuv_to_rgb_table.cc', |
| - 'base/simd/yuv_to_rgb_table.h', |
| ], |
| 'conditions': [ |
| - # TODO(jschuh): Get MMX enabled on Win64. crbug.com/179657 |
| - [ 'OS!="win" or target_arch=="ia32"', { |
| - 'sources': [ |
| - 'base/simd/filter_yuv_mmx.cc', |
| - ], |
| + ['component=="shared_library"', { |
| + 'variables': { |
| + 'yasm_flags': ['-DEXPORT_SYMBOLS'], |
| + }, |
| }], |
| - [ 'target_arch == "x64"', { |
| + ['target_arch=="x64"', { |
| # Source files optimized for X64 systems. |
| 'sources': [ |
| 'base/simd/linear_scale_yuv_to_rgb_mmx_x64.asm', |
| 'base/simd/scale_yuv_to_rgb_sse2_x64.asm', |
| ], |
| 'variables': { |
| - 'yasm_flags': [ |
| - '-DARCH_X86_64', |
| - ], |
| + 'yasm_flags': ['-DARCH_X86_64'], |
| }, |
| }], |
| - [ 'os_posix == 1 and OS != "mac" and OS != "android"', { |
| - 'cflags': [ |
| - '-msse2', |
| - ], |
| - }], |
| - [ 'OS == "mac"', { |
| - 'configurations': { |
| - 'Debug': { |
| - 'xcode_settings': { |
|
Ami GONE FROM CHROMIUM
2013/05/18 02:22:04
Where's this going?
DaleCurtis
2013/05/23 23:43:23
Pinged the original author (dmaclach) and he said
|
| - # gcc on the mac builds horribly unoptimized sse code in |
| - # debug mode. Since this is rarely going to be debugged, |
| - # run with full optimizations in Debug as well as Release. |
| - 'GCC_OPTIMIZATION_LEVEL': '3', # -O3 |
| - }, |
| - }, |
| - }, |
| + ['OS=="mac"', { |
| 'variables': { |
| 'yasm_flags': [ |
| '-DPREFIX', |
| @@ -1243,10 +1213,10 @@ |
| ], |
| }, |
| }], |
| - [ 'os_posix==1 and OS!="mac"', { |
| + ['os_posix==1 and OS!="mac"', { |
| 'variables': { |
| 'conditions': [ |
| - [ 'target_arch=="ia32"', { |
| + ['target_arch=="ia32"', { |
| 'yasm_flags': [ |
| '-DX86_32', |
| '-DELF', |
| @@ -1269,15 +1239,95 @@ |
| # search path be relative to src/ per Chromium policy. |
| '-I..', |
| ], |
| + 'yasm_includes': [ |
| + 'base/simd/convert_rgb_to_yuv_ssse3.inc', |
| + 'base/simd/convert_yuv_to_rgb_mmx.inc', |
| + 'base/simd/convert_yuva_to_argb_mmx.inc', |
| + 'base/simd/linear_scale_yuv_to_rgb_mmx.inc', |
| + 'base/simd/scale_yuv_to_rgb_mmx.inc', |
| + ], |
| }, |
| 'msvs_2010_disable_uldi_when_referenced': 1, |
| 'includes': [ |
| '../third_party/yasm/yasm_compile.gypi', |
| ], |
| }, |
| + { |
| + 'target_name': 'media_mmx', |
| + 'type': 'static_library', |
| + 'cflags': [ |
| + '-mmmx', |
| + ], |
| + 'include_dirs': [ |
| + '..', |
| + ], |
| + 'defines': [ |
| + 'MEDIA_IMPLEMENTATION', |
| + ], |
| + 'conditions': [ |
| + # TODO(jschuh): Get MMX enabled on Win64. crbug.com/179657 |
| + ['OS!="win" or target_arch=="ia32"', { |
| + 'sources': [ |
| + 'base/simd/filter_yuv_mmx.cc', |
| + ], |
| + }], |
| + ], |
| + }, |
| + { |
| + 'target_name': 'media_sse', |
| + 'type': 'static_library', |
| + 'cflags': [ |
| + '-msse', |
| + ], |
| + 'include_dirs': [ |
| + '..', |
| + ], |
| + 'defines': [ |
| + 'MEDIA_IMPLEMENTATION', |
| + ], |
| + 'sources': [ |
| + 'base/simd/sinc_resampler_sse.cc', |
| + ], |
| + }, |
| + { |
| + 'target_name': 'media_sse2', |
| + 'type': 'static_library', |
| + 'cflags': [ |
| + '-msse2', |
| + ], |
| + 'include_dirs': [ |
| + '..', |
| + ], |
| + 'defines': [ |
| + 'MEDIA_IMPLEMENTATION', |
| + ], |
| + 'sources': [ |
| + 'base/simd/convert_rgb_to_yuv_sse2.cc', |
| + 'base/simd/convert_rgb_to_yuv_ssse3.cc', |
| + 'base/simd/filter_yuv_sse2.cc', |
| + 'video/capture/screen/differ_block_sse2.cc', |
| + 'video/capture/screen/differ_block_sse2.h', |
| + ], |
| + }, |
| + { |
| + 'target_name': 'shared_memory_support_sse', |
| + 'type': 'static_library', |
| + 'cflags': [ |
| + '-msse', |
| + ], |
| + 'include_dirs': [ |
| + '..', |
| + ], |
| + 'defines': [ |
| + 'MEDIA_IMPLEMENTATION', |
| + ], |
| + 'sources': [ |
| + 'base/simd/vector_math_sse.cc', |
| + ], |
| + }, |
| ], # targets |
| }], |
| - ['OS != "ios"', { |
| + ['OS!="ios"', { |
| 'targets': [ |
| { |
| # Minimal target for NaCl and other renderer side media clients which |
| @@ -1301,57 +1351,17 @@ |
| '<@(shared_memory_support_sources)', |
| ], |
| 'conditions': [ |
| - [ 'target_arch == "ia32" or target_arch == "x64"', { |
| - 'dependencies': [ |
| - 'media_sse', |
| - ], |
| - }], |
| - ['arm_neon == 1', { |
| + ['arm_neon==1', { |
| 'defines': [ |
| 'USE_NEON' |
| ], |
| }], |
| - ], |
| - }, |
| - { |
| - 'target_name': 'yuv_convert', |
| - 'type': 'static_library', |
| - 'include_dirs': [ |
| - '..', |
| - ], |
| - 'conditions': [ |
| - [ 'target_arch == "ia32" or target_arch == "x64"', { |
| - 'dependencies': [ |
| - 'yuv_convert_simd_x86', |
| - ], |
| - }], |
| - [ 'target_arch == "arm" or target_arch == "mipsel"', { |
| + ['target_arch=="ia32" or target_arch=="x64"', { |
| 'dependencies': [ |
| - 'yuv_convert_simd_c', |
| + 'shared_memory_support_sse' |
| ], |
| }], |
| ], |
| - 'sources': [ |
| - 'base/yuv_convert.cc', |
| - 'base/yuv_convert.h', |
| - ], |
| - }, |
| - { |
| - 'target_name': 'yuv_convert_simd_c', |
| - 'type': 'static_library', |
| - 'include_dirs': [ |
| - '..', |
| - ], |
| - 'sources': [ |
| - 'base/simd/convert_rgb_to_yuv.h', |
| - 'base/simd/convert_rgb_to_yuv_c.cc', |
| - 'base/simd/convert_yuv_to_rgb.h', |
| - 'base/simd/convert_yuv_to_rgb_c.cc', |
| - 'base/simd/filter_yuv.h', |
| - 'base/simd/filter_yuv_c.cc', |
| - 'base/simd/yuv_to_rgb_table.cc', |
| - 'base/simd/yuv_to_rgb_table.h', |
| - ], |
| }, |
| { |
| 'target_name': 'seek_tester', |
| @@ -1379,14 +1389,13 @@ |
| }, |
| ], |
| }], |
| - ['(OS == "win" or toolkit_uses_gtk == 1) and use_aura != 1', { |
| + ['(OS=="win" or toolkit_uses_gtk==1) and use_aura!=1', { |
| 'targets': [ |
| { |
| 'target_name': 'shader_bench', |
| 'type': 'executable', |
| 'dependencies': [ |
| 'media', |
| - 'yuv_convert', |
| '../base/base.gyp:base', |
| '../ui/gl/gl.gyp:gl', |
| '../ui/ui.gyp:ui', |
| @@ -1405,7 +1414,7 @@ |
| 'tools/shader_bench/window.h', |
| ], |
| 'conditions': [ |
| - ['toolkit_uses_gtk == 1', { |
| + ['toolkit_uses_gtk==1', { |
| 'dependencies': [ |
| '../build/linux/system.gyp:gtk', |
| ], |
| @@ -1428,14 +1437,13 @@ |
| }, |
| ], |
| }], |
| - ['use_x11 == 1', { |
| + ['use_x11==1', { |
| 'targets': [ |
| { |
| 'target_name': 'player_x11', |
| 'type': 'executable', |
| 'dependencies': [ |
| 'media', |
| - 'yuv_convert', |
| '../base/base.gyp:base', |
| '../ui/gl/gl.gyp:gl', |
| '../ui/ui.gyp:ui', |
| @@ -1462,7 +1470,7 @@ |
| }], |
| # Special target to wrap a gtest_target_type==shared_library |
| # media_unittests into an android apk for execution. |
| - ['OS == "android" and gtest_target_type == "shared_library"', { |
| + ['OS=="android" and gtest_target_type=="shared_library"', { |
| 'targets': [ |
| { |
| 'target_name': 'media_unittests_apk', |
| @@ -1475,11 +1483,11 @@ |
| 'test_suite_name': 'media_unittests', |
| 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)media_unittests<(SHARED_LIB_SUFFIX)', |
| }, |
| - 'includes': [ '../build/apk_test.gypi' ], |
| + 'includes': ['../build/apk_test.gypi'], |
| }, |
| ], |
| }], |
| - ['OS == "android"', { |
| + ['OS=="android"', { |
| 'targets': [ |
| { |
| 'target_name': 'media_player_jni_headers', |
| @@ -1488,7 +1496,7 @@ |
| 'jni_gen_package': 'media', |
| 'input_java_class': 'android/media/MediaPlayer.class', |
| }, |
| - 'includes': [ '../build/jar_file_jni_generator.gypi' ], |
| + 'includes': ['../build/jar_file_jni_generator.gypi'], |
| }, |
| { |
| 'target_name': 'media_android_jni_headers', |
| @@ -1505,7 +1513,7 @@ |
| 'variables': { |
| 'jni_gen_package': 'media', |
| }, |
| - 'includes': [ '../build/jni_generator.gypi' ], |
| + 'includes': ['../build/jni_generator.gypi'], |
| }, |
| { |
| 'target_name': 'video_capture_android_jni_headers', |
| @@ -1516,7 +1524,7 @@ |
| 'variables': { |
| 'jni_gen_package': 'media', |
| }, |
| - 'includes': [ '../build/jni_generator.gypi' ], |
| + 'includes': ['../build/jni_generator.gypi'], |
| }, |
| { |
| 'target_name': 'media_codec_jni_headers', |
| @@ -1525,7 +1533,7 @@ |
| 'jni_gen_package': 'media', |
| 'input_java_class': 'android/media/MediaCodec.class', |
| }, |
| - 'includes': [ '../build/jar_file_jni_generator.gypi' ], |
| + 'includes': ['../build/jar_file_jni_generator.gypi'], |
| }, |
| { |
| 'target_name': 'media_format_jni_headers', |
| @@ -1534,7 +1542,7 @@ |
| 'jni_gen_package': 'media', |
| 'input_java_class': 'android/media/MediaFormat.class', |
| }, |
| - 'includes': [ '../build/jar_file_jni_generator.gypi' ], |
| + 'includes': ['../build/jar_file_jni_generator.gypi'], |
| }, |
| { |
| 'target_name': 'player_android', |
| @@ -1555,7 +1563,7 @@ |
| 'base/android/webaudio_media_codec_info.h', |
| ], |
| 'conditions': [ |
| - ['google_tv == 1', { |
| + ['google_tv==1', { |
| 'sources': [ |
| 'base/android/demuxer_stream_player_params.cc', |
| 'base/android/demuxer_stream_player_params.h', |
| @@ -1584,12 +1592,12 @@ |
| 'variables': { |
| 'java_in_dir': 'base/android/java', |
| }, |
| - 'includes': [ '../build/java.gypi' ], |
| + 'includes': ['../build/java.gypi'], |
| }, |
| ], |
| }], |
| - ['media_use_ffmpeg == 1', { |
| + ['media_use_ffmpeg==1', { |
| 'targets': [ |
| { |
| 'target_name': 'ffmpeg_unittests', |
| @@ -1608,7 +1616,7 @@ |
| 'ffmpeg/ffmpeg_unittest.cc', |
| ], |
| 'conditions': [ |
| - ['toolkit_uses_gtk == 1', { |
| + ['toolkit_uses_gtk==1', { |
| 'dependencies': [ |
| # Needed for the following #include chain: |
| # base/run_all_unittests.cc |
| @@ -1685,49 +1693,5 @@ |
| }, |
| ], |
| }], |
| - [ 'screen_capture_supported==1 and (target_arch=="ia32" or target_arch=="x64")', { |
| - 'targets': [ |
| - { |
| - 'target_name': 'differ_block_sse2', |
| - 'type': 'static_library', |
| - 'conditions': [ |
| - [ 'os_posix == 1 and OS != "mac"', { |
| - 'cflags': [ |
| - '-msse2', |
| - ], |
| - }], |
| - ], |
| - 'include_dirs': [ |
| - '..', |
| - ], |
| - 'sources': [ |
| - 'video/capture/screen/differ_block_sse2.cc', |
| - 'video/capture/screen/differ_block_sse2.h', |
| - ], |
| - }, # end of target differ_block_sse2 |
| - ], |
| - }], |
| - # ios check is necessary due to http://crbug.com/172682. |
| - ['OS != "ios" and (target_arch=="ia32" or target_arch=="x64")', { |
| - 'targets': [ |
| - { |
| - 'target_name': 'media_sse', |
| - 'type': 'static_library', |
| - 'cflags': [ |
| - '-msse', |
| - ], |
| - 'include_dirs': [ |
| - '..', |
| - ], |
| - 'defines': [ |
| - 'MEDIA_IMPLEMENTATION', |
| - ], |
| - 'sources': [ |
| - 'base/simd/sinc_resampler_sse.cc', |
| - 'base/simd/vector_math_sse.cc', |
| - ], |
| - }, # end of target media_sse |
| - ], |
| - }], |
| ], |
| } |