diff options
| author | Deb Mukherjee <debargha@google.com> | 2014-05-22 12:30:38 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-22 12:30:38 -0700 |
| commit | b59b3241713282d50af2dce6ae5a1f57223ca6b2 (patch) | |
| tree | f391aac9b678e7cf84e292d723b272411f595e93 /vp9 | |
| parent | 6e6f5881d8f23cee4d21d4ae86d59363713f3bf4 (diff) | |
| parent | e272273443ceec31d586003e740af97541e9c4ce (diff) | |
| download | libvpx-b59b3241713282d50af2dce6ae5a1f57223ca6b2.tar libvpx-b59b3241713282d50af2dce6ae5a1f57223ca6b2.tar.gz libvpx-b59b3241713282d50af2dce6ae5a1f57223ca6b2.tar.bz2 libvpx-b59b3241713282d50af2dce6ae5a1f57223ca6b2.zip | |
Merge "Renames x86_64 specific asm files"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/common/x86/vp9_idct_ssse3_x86_64.asm (renamed from vp9/common/x86/vp9_idct_ssse3.asm) | 0 | ||||
| -rw-r--r-- | vp9/encoder/x86/vp9_dct_ssse3_x86_64.asm (renamed from vp9/encoder/x86/vp9_dct_ssse3.asm) | 0 | ||||
| -rw-r--r-- | vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm (renamed from vp9/encoder/x86/vp9_quantize_ssse3.asm) | 0 | ||||
| -rw-r--r-- | vp9/encoder/x86/vp9_ssim_opt_x86_64.asm (renamed from vp9/encoder/x86/vp9_ssim_opt.asm) | 0 | ||||
| -rw-r--r-- | vp9/vp9_common.mk | 2 | ||||
| -rw-r--r-- | vp9/vp9cx.mk | 6 |
6 files changed, 4 insertions, 4 deletions
diff --git a/vp9/common/x86/vp9_idct_ssse3.asm b/vp9/common/x86/vp9_idct_ssse3_x86_64.asm index 2c1060710..2c1060710 100644 --- a/vp9/common/x86/vp9_idct_ssse3.asm +++ b/vp9/common/x86/vp9_idct_ssse3_x86_64.asm diff --git a/vp9/encoder/x86/vp9_dct_ssse3.asm b/vp9/encoder/x86/vp9_dct_ssse3_x86_64.asm index 8723a7114..8723a7114 100644 --- a/vp9/encoder/x86/vp9_dct_ssse3.asm +++ b/vp9/encoder/x86/vp9_dct_ssse3_x86_64.asm diff --git a/vp9/encoder/x86/vp9_quantize_ssse3.asm b/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm index 48ccef8cc..48ccef8cc 100644 --- a/vp9/encoder/x86/vp9_quantize_ssse3.asm +++ b/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm diff --git a/vp9/encoder/x86/vp9_ssim_opt.asm b/vp9/encoder/x86/vp9_ssim_opt_x86_64.asm index 455d10d2c..455d10d2c 100644 --- a/vp9/encoder/x86/vp9_ssim_opt.asm +++ b/vp9/encoder/x86/vp9_ssim_opt_x86_64.asm diff --git a/vp9/vp9_common.mk b/vp9/vp9_common.mk index 3b4d6b901..7bbfbdd33 100644 --- a/vp9/vp9_common.mk +++ b/vp9/vp9_common.mk @@ -121,7 +121,7 @@ VP9_COMMON_SRCS-$(HAVE_DSPR2) += common/mips/dspr2/vp9_mblpf_vert_loopfilter_ds VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_idct_intrin_sse2.c ifeq ($(ARCH_X86_64), yes) -VP9_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/vp9_idct_ssse3.asm +VP9_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/vp9_idct_ssse3_x86_64.asm endif VP9_COMMON_SRCS-$(HAVE_NEON_ASM) += common/arm/neon/vp9_convolve_neon.c diff --git a/vp9/vp9cx.mk b/vp9/vp9cx.mk index 6e5c521ab..a44ffc1ca 100644 --- a/vp9/vp9cx.mk +++ b/vp9/vp9cx.mk @@ -112,12 +112,12 @@ VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subpel_variance.asm endif ifeq ($(ARCH_X86_64),yes) -VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_quantize_ssse3.asm -VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_dct_ssse3.asm +VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_quantize_ssse3_x86_64.asm +VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_dct_ssse3_x86_64.asm endif VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_sad_ssse3.asm VP9_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/vp9_sad_sse4.asm -VP9_CX_SRCS-$(ARCH_X86_64) += encoder/x86/vp9_ssim_opt.asm +VP9_CX_SRCS-$(ARCH_X86_64) += encoder/x86/vp9_ssim_opt_x86_64.asm VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2.c VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct32x32_sse2.c |