generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Normalize x64 and ia32 sse2 behavior in libvpx.

Browse Source 
BUG=6947196
TEST=trybots

Review URL: https://webrtc-codereview.appspot.com/708009

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2576 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org 2012-08-08 21:55:20 +00:00
parent ccb7cc6175
commit 7f3d4c6781
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
third_party/libvpx/libvpx.gyp vendored
View File

@ -40,7 +40,7 @@
# TODO(andrew): Hack to ensure we pass -msse2 to gcc on Linux for files # TODO(andrew): Hack to ensure we pass -msse2 to gcc on Linux for files
# containing SSE intrinsics. This should be handled in the gyp generator # containing SSE intrinsics. This should be handled in the gyp generator
# scripts somehow. Clang (default on Mac) doesn't require this. # scripts somehow. Clang (default on Mac) doesn't require this.
['target_arch=="ia32"', { ['target_arch=="ia32" or target_arch=="x64"', {
'targets' : [ 'targets' : [
{ {
'target_name': 'libvpx_sse2', 'target_name': 'libvpx_sse2',
@ -55,7 +55,16 @@
'sources': [ 'sources': [
'source/libvpx/vp8/encoder/x86/denoising_sse2.c', 'source/libvpx/vp8/encoder/x86/denoising_sse2.c',
], ],
'cflags': [ '-msse2', ], 'conditions': [
['os_posix==1 and OS!="mac"', {
'cflags': [ '-msse2', ],
}],
['OS=="mac"', {
'xcode_settings': {
'OTHER_CFLAGS': [ '-msse2', ],
},
}],
],
}, },
], ],
}], }],
@ -99,6 +108,7 @@
'includes': [ 'includes': [
'libvpx_srcs_x86_64.gypi', 'libvpx_srcs_x86_64.gypi',
], ],
'dependencies': [ 'libvpx_sse2', ],
}], }],
], ],
}, },

3
third_party/libvpx/libvpx_srcs_x86_64.gypi vendored
View File

@ -164,7 +164,8 @@
'source/libvpx/vp8/encoder/treewriter.h', 'source/libvpx/vp8/encoder/treewriter.h',
'source/libvpx/vp8/encoder/x86/dct_mmx.asm', 'source/libvpx/vp8/encoder/x86/dct_mmx.asm',
'source/libvpx/vp8/encoder/x86/dct_sse2.asm', 'source/libvpx/vp8/encoder/x86/dct_sse2.asm',
'source/libvpx/vp8/encoder/x86/denoising_sse2.c', # Hack; refer to libvpx.gyp
#'source/libvpx/vp8/encoder/x86/denoising_sse2.c',
'source/libvpx/vp8/encoder/x86/encodeopt.asm', 'source/libvpx/vp8/encoder/x86/encodeopt.asm',
'source/libvpx/vp8/encoder/x86/fwalsh_sse2.asm', 'source/libvpx/vp8/encoder/x86/fwalsh_sse2.asm',
'source/libvpx/vp8/encoder/x86/quantize_mmx.asm', 'source/libvpx/vp8/encoder/x86/quantize_mmx.asm',