diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-12 23:20:05 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-12 23:20:05 +0000 |
| commit | 5de5d139093b61f1c4cd228a5efb161e0e4cb08b (patch) | |
| tree | 5a6f8f25f19df81fa13d9ed7738cb4565dc393b8 /third_party/ffmpeg | |
| parent | 94251a007ae24cde472ce487a2d631d31e4b43e4 (diff) | |
| download | chromium_src-5de5d139093b61f1c4cd228a5efb161e0e4cb08b.zip chromium_src-5de5d139093b61f1c4cd228a5efb161e0e4cb08b.tar.gz chromium_src-5de5d139093b61f1c4cd228a5efb161e0e4cb08b.tar.bz2 | |
ffmpeg on arm needs different assembly files.
BUG=32755
TEST=linux arm version should build.
Review URL: http://codereview.chromium.org/596089
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38976 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/ffmpeg')
| -rwxr-xr-x | third_party/ffmpeg/ffmpeg.gyp | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index 8743135..706a90b 100755 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -2,8 +2,11 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +# TODO(fbarchard): Turn off --enable-memalign-hack for all but windows. # TODO(ajwong): Determine if we want to statically link libz. + + { 'target_defaults': { 'conditions': [ @@ -238,7 +241,6 @@ 'make_ffmpeg_asm_lib', ], 'sources': [ - 'source/patched-ffmpeg-mt/libavcodec/x86/dsputil_mmx.c', 'source/patched-ffmpeg-mt/libavcodec/x86/vc1dsp_mmx.c', ], }], @@ -265,10 +267,15 @@ '-mfloat-abi=softfp', ], 'sources': [ - 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_arm.c', - 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_arm_s.S', + 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_arm.S', + 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_armv6.S', + 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_arm.c', + 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_armv5te.c', + 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_armv6.c', + 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_neon.c', + 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_vfp.c', + 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_neon.S', 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_vfp.S', - 'source/patched-ffmpeg-mt/libavcodec/arm/float_arm_vfp.c', 'source/patched-ffmpeg-mt/libavcodec/arm/jrevdct_arm.S', 'source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_arm.S', 'source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_armv5te.S', @@ -281,10 +288,10 @@ # TODO(fbarchard): dsputil_neon code should be used by chromium # for ogg, but with h264 references only if CONFIG_H264_DECODER # is enabled. - 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_neon.c', - 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_neon_s.S', 'source/patched-ffmpeg-mt/libavcodec/arm/h264dsp_neon.S', 'source/patched-ffmpeg-mt/libavcodec/arm/h264idct_neon.S', + 'source/patched-ffmpeg-mt/libavcodec/arm/h264pred_init_arm.c', + 'source/patched-ffmpeg-mt/libavcodec/arm/h264pred_neon.S', 'source/patched-ffmpeg-mt/libavcodec/arm/mpegvideo_arm.c', 'source/patched-ffmpeg-mt/libavcodec/arm/mpegvideo_armv5te.c', 'source/patched-ffmpeg-mt/libavcodec/arm/mpegvideo_armv5te_s.S', @@ -293,7 +300,8 @@ ['target_arch=="arm" and ffmpeg_branding=="ChromeOS"', { 'sources': [ 'source/patched-ffmpeg-mt/libavcodec/h264_mp4toannexb_bsf.c', - 'source/patched-ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c', +# TODO(fbarchard): mpeg4video_es_bsf.c requires a patch +# 'source/patched-ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c', ], }], # target_arch=="arm" and ffmpeg_branding=="ChromeOS" ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { |