diff options
author | Johann <johann.koenig@duck.com> | 2013-04-25 23:26:20 -0700 |
---|---|---|
committer | Johann <johann.koenig@duck.com> | 2013-04-25 23:26:20 -0700 |
commit | 863601c58968a5816ff17722432b5eedc6e13eae (patch) | |
tree | 58285b4a33b2a82d20229f69a7663c0355c2480f /vp9 | |
parent | c5b127afea85176e4b43c525eac238924e4d2116 (diff) | |
download | libvpx-863601c58968a5816ff17722432b5eedc6e13eae.tar libvpx-863601c58968a5816ff17722432b5eedc6e13eae.tar.gz libvpx-863601c58968a5816ff17722432b5eedc6e13eae.tar.bz2 libvpx-863601c58968a5816ff17722432b5eedc6e13eae.zip |
Normalize more intrinsic filenames
vp9_dequantize_x86 has only sse2 functions.
vp9_dct_sse2_intrinsics has no namespace collision and can drop
_intrinsics.
vp9_idct_mmx.h is unused.
Change-Id: Ic16e31fb372a1d1e841a62ecb4189fe8f95808ec
Diffstat (limited to 'vp9')
-rw-r--r-- | vp9/decoder/x86/vp9_dequantize_sse2.c (renamed from vp9/decoder/x86/vp9_dequantize_x86.c) | 3 | ||||
-rw-r--r-- | vp9/decoder/x86/vp9_idct_mmx.h | 22 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_dct_sse2.c (renamed from vp9/encoder/x86/vp9_dct_sse2_intrinsics.c) | 0 | ||||
-rw-r--r-- | vp9/vp9cx.mk | 6 | ||||
-rw-r--r-- | vp9/vp9dx.mk | 6 |
5 files changed, 6 insertions, 31 deletions
diff --git a/vp9/decoder/x86/vp9_dequantize_x86.c b/vp9/decoder/x86/vp9_dequantize_sse2.c index acfae2a27..1dfb8e08f 100644 --- a/vp9/decoder/x86/vp9_dequantize_x86.c +++ b/vp9/decoder/x86/vp9_dequantize_sse2.c @@ -15,8 +15,6 @@ #include "vp9/common/vp9_common.h" #include "vp9/common/vp9_idct.h" -#if HAVE_SSE2 - void vp9_add_residual_4x4_sse2(const int16_t *diff, const uint8_t *pred, int pitch, uint8_t *dest, int stride) { const int width = 4; @@ -452,4 +450,3 @@ void vp9_add_constant_residual_32x32_sse2(const int16_t diff, dest += 4 * stride; } while (--i); } -#endif diff --git a/vp9/decoder/x86/vp9_idct_mmx.h b/vp9/decoder/x86/vp9_idct_mmx.h deleted file mode 100644 index 7d9829175..000000000 --- a/vp9/decoder/x86/vp9_idct_mmx.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2010 The WebM project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef VP9_DECODER_X86_VP9_IDCT_MMX_H_ -#define VP9_DECODER_X86_VP9_IDCT_MMX_H_ - - -void vp9_dequant_dc_idct_add_mmx(short *input, const short *dq, - unsigned char *pred, unsigned char *dest, - int pitch, int stride, int Dc); - -void vp9_dequant_idct_add_mmx(short *input, const short *dq, unsigned char *pred, - unsigned char *dest, int pitch, int stride); - -#endif /* VP9_DECODER_X86_VP9_IDCT_MMX_H_ */ diff --git a/vp9/encoder/x86/vp9_dct_sse2_intrinsics.c b/vp9/encoder/x86/vp9_dct_sse2.c index 49cb837e0..49cb837e0 100644 --- a/vp9/encoder/x86/vp9_dct_sse2_intrinsics.c +++ b/vp9/encoder/x86/vp9_dct_sse2.c diff --git a/vp9/vp9cx.mk b/vp9/vp9cx.mk index 13785f71b..51e24b846 100644 --- a/vp9/vp9cx.mk +++ b/vp9/vp9cx.mk @@ -109,10 +109,10 @@ VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_quantize_mmx.asm VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_encodeopt.asm VP9_CX_SRCS-$(ARCH_X86_64) += encoder/x86/vp9_ssim_opt.asm -VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2_intrinsics.c +VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2.c ifeq ($(HAVE_SSE2),yes) -vp9/encoder/x86/vp9_dct_sse2_intrinsics.c.d: CFLAGS += -msse2 -vp9/encoder/x86/vp9_dct_sse2_intrinsics.c.o: CFLAGS += -msse2 +vp9/encoder/x86/vp9_dct_sse2.c.d: CFLAGS += -msse2 +vp9/encoder/x86/vp9_dct_sse2.c.o: CFLAGS += -msse2 endif diff --git a/vp9/vp9dx.mk b/vp9/vp9dx.mk index 239ae30b6..5cab6fc1f 100644 --- a/vp9/vp9dx.mk +++ b/vp9/vp9dx.mk @@ -38,10 +38,10 @@ VP9_DX_SRCS-yes := $(filter-out $(VP9_DX_SRCS_REMOVE-yes),$(VP9_DX_SRCS-yes)) VP9_DX_SRCS-$(HAVE_SSE2) += decoder/x86/vp9_idct_blk_sse2.c -VP9_DX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += decoder/x86/vp9_dequantize_x86.c +VP9_DX_SRCS-$(HAVE_SSE2) += decoder/x86/vp9_dequantize_sse2.c ifeq ($(HAVE_SSE2),yes) -vp9/decoder/x86/vp9_dequantize_x86.c.o: CFLAGS += -msse2 -vp9/decoder/x86/vp9_dequantize_x86.c.d: CFLAGS += -msse2 +vp9/decoder/x86/vp9_dequantize_sse2.c.o: CFLAGS += -msse2 +vp9/decoder/x86/vp9_dequantize_sse2.c.d: CFLAGS += -msse2 endif $(eval $(call asm_offsets_template,\ |