Commit 863601c5 authored by Johann's avatar Johann

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
parent c5b127af
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
#include "vp9/common/vp9_common.h" #include "vp9/common/vp9_common.h"
#include "vp9/common/vp9_idct.h" #include "vp9/common/vp9_idct.h"
#if HAVE_SSE2
void vp9_add_residual_4x4_sse2(const int16_t *diff, const uint8_t *pred, void vp9_add_residual_4x4_sse2(const int16_t *diff, const uint8_t *pred,
int pitch, uint8_t *dest, int stride) { int pitch, uint8_t *dest, int stride) {
const int width = 4; const int width = 4;
...@@ -452,4 +450,3 @@ void vp9_add_constant_residual_32x32_sse2(const int16_t diff, ...@@ -452,4 +450,3 @@ void vp9_add_constant_residual_32x32_sse2(const int16_t diff,
dest += 4 * stride; dest += 4 * stride;
} while (--i); } while (--i);
} }
#endif
/*
* 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_ */
...@@ -109,10 +109,10 @@ VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_quantize_mmx.asm ...@@ -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)$(ARCH_X86_64) += encoder/x86/vp9_encodeopt.asm
VP9_CX_SRCS-$(ARCH_X86_64) += encoder/x86/vp9_ssim_opt.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) ifeq ($(HAVE_SSE2),yes)
vp9/encoder/x86/vp9_dct_sse2_intrinsics.c.d: CFLAGS += -msse2 vp9/encoder/x86/vp9_dct_sse2.c.d: CFLAGS += -msse2
vp9/encoder/x86/vp9_dct_sse2_intrinsics.c.o: CFLAGS += -msse2 vp9/encoder/x86/vp9_dct_sse2.c.o: CFLAGS += -msse2
endif endif
......
...@@ -38,10 +38,10 @@ VP9_DX_SRCS-yes := $(filter-out $(VP9_DX_SRCS_REMOVE-yes),$(VP9_DX_SRCS-yes)) ...@@ -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-$(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) ifeq ($(HAVE_SSE2),yes)
vp9/decoder/x86/vp9_dequantize_x86.c.o: CFLAGS += -msse2 vp9/decoder/x86/vp9_dequantize_sse2.c.o: CFLAGS += -msse2
vp9/decoder/x86/vp9_dequantize_x86.c.d: CFLAGS += -msse2 vp9/decoder/x86/vp9_dequantize_sse2.c.d: CFLAGS += -msse2
endif endif
$(eval $(call asm_offsets_template,\ $(eval $(call asm_offsets_template,\
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment