| Index: media/media.gyp
|
| diff --git a/media/media.gyp b/media/media.gyp
|
| index 8be129032ea431e9f4ba5d6593bdb04ba1d9710a..60a192abb9f286b9936592ce9d245cac2f54c88a 100644
|
| --- a/media/media.gyp
|
| +++ b/media/media.gyp
|
| @@ -345,7 +345,12 @@
|
| 'conditions': [
|
| [ 'target_arch == "ia32" or target_arch == "x64"', {
|
| 'dependencies': [
|
| - 'yuv_convert_sse2',
|
| + 'yuv_convert_simd_x86',
|
| + ],
|
| + }],
|
| + [ 'target_arch == "arm"', {
|
| + 'dependencies': [
|
| + 'yuv_convert_simd_arm',
|
| ],
|
| }],
|
| ],
|
| @@ -361,15 +366,45 @@
|
| ],
|
| },
|
| {
|
| - 'target_name': 'yuv_convert_sse2',
|
| + 'target_name': 'yuv_convert_simd_x86',
|
| 'type': 'static_library',
|
| 'include_dirs': [
|
| '..',
|
| ],
|
| + 'sources': [
|
| + 'base/yuv_convert_sse2.cc',
|
| + 'base/simd/convert_rgb_to_yuv_x86.cc',
|
| + 'base/simd/convert_rgb_to_yuv_ssse3.asm',
|
| + 'base/simd/convert_rgb_to_yuv_ssse3.inc',
|
| + 'base/simd/convert_yuv_to_rgb_c.cc',
|
| + 'base/simd/convert_yuv_to_rgb_x86.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/filter_yuv.h',
|
| + 'base/simd/filter_yuv_c.cc',
|
| + 'base/simd/filter_yuv_mmx.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',
|
| + ],
|
| 'conditions': [
|
| + [ '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',
|
| + ],
|
| + }],
|
| [ 'os_posix == 1 and OS != "mac"', {
|
| 'cflags': [
|
| '-msse2',
|
| + '-msse3',
|
| + '-mssse3',
|
| ],
|
| }],
|
| [ 'OS == "mac"', {
|
| @@ -432,10 +467,6 @@
|
| },
|
| }],
|
| ],
|
| - 'sources': [
|
| - 'base/yuv_convert_sse2.cc',
|
| - 'base/simd/convert_rgb_to_yuv.cc',
|
| - ],
|
| 'variables': {
|
| 'yasm_output_path': '<(SHARED_INTERMEDIATE_DIR)/media',
|
| },
|
| @@ -444,6 +475,18 @@
|
| ],
|
| },
|
| {
|
| + 'target_name': 'yuv_convert_simd_arm',
|
| + 'type': 'static_library',
|
| + 'include_dirs': [
|
| + '..',
|
| + ],
|
| + 'sources': [
|
| + 'base/simd/convert_yuv_to_rgb_c.cc',
|
| + 'base/simd/filter_yuv.h',
|
| + 'base/simd/filter_yuv_c.cc',
|
| + ],
|
| + },
|
| + {
|
| 'target_name': 'ffmpeg_unittests',
|
| 'type': 'executable',
|
| 'dependencies': [
|
|
|