Merge "rename vp9_dct32x32_sse2.c to vp9_dct32x32_sse2_impl.h"

This commit is contained in:
James Zern 2015-05-19 00:01:21 +00:00 коммит произвёл Gerrit Code Review
Родитель 0f854e9ab5 587a71f1d6
Коммит 1bcf7a35e9
3 изменённых файлов: 6 добавлений и 6 удалений

Просмотреть файл

@ -2371,7 +2371,7 @@ void vp9_highbd_fht16x16_sse2(const int16_t *input, tran_low_t *output,
/* /*
* The DCTnxn functions are defined using the macros below. The main code for * The DCTnxn functions are defined using the macros below. The main code for
* them is in separate files (vp9/encoder/x86/vp9_dct_impl_sse2.c & * them is in separate files (vp9/encoder/x86/vp9_dct_impl_sse2.c &
* vp9/encoder/x86/vp9_dct32x32_sse2.c) which are used by both the 8 bit code * vp9/encoder/x86/vp9_dct32x32_sse2_impl.h) which are used by both the 8 bit code
* and the high bit depth code. * and the high bit depth code.
*/ */
@ -2387,13 +2387,13 @@ void vp9_highbd_fht16x16_sse2(const int16_t *input, tran_low_t *output,
#define FDCT32x32_2D vp9_fdct32x32_rd_sse2 #define FDCT32x32_2D vp9_fdct32x32_rd_sse2
#define FDCT32x32_HIGH_PRECISION 0 #define FDCT32x32_HIGH_PRECISION 0
#include "vp9/encoder/x86/vp9_dct32x32_sse2.c" #include "vp9/encoder/x86/vp9_dct32x32_sse2_impl.h"
#undef FDCT32x32_2D #undef FDCT32x32_2D
#undef FDCT32x32_HIGH_PRECISION #undef FDCT32x32_HIGH_PRECISION
#define FDCT32x32_2D vp9_fdct32x32_sse2 #define FDCT32x32_2D vp9_fdct32x32_sse2
#define FDCT32x32_HIGH_PRECISION 1 #define FDCT32x32_HIGH_PRECISION 1
#include "vp9/encoder/x86/vp9_dct32x32_sse2.c" // NOLINT #include "vp9/encoder/x86/vp9_dct32x32_sse2_impl.h" // NOLINT
#undef FDCT32x32_2D #undef FDCT32x32_2D
#undef FDCT32x32_HIGH_PRECISION #undef FDCT32x32_HIGH_PRECISION
@ -2414,13 +2414,13 @@ void vp9_highbd_fht16x16_sse2(const int16_t *input, tran_low_t *output,
#define FDCT32x32_2D vp9_highbd_fdct32x32_rd_sse2 #define FDCT32x32_2D vp9_highbd_fdct32x32_rd_sse2
#define FDCT32x32_HIGH_PRECISION 0 #define FDCT32x32_HIGH_PRECISION 0
#include "vp9/encoder/x86/vp9_dct32x32_sse2.c" // NOLINT #include "vp9/encoder/x86/vp9_dct32x32_sse2_impl.h" // NOLINT
#undef FDCT32x32_2D #undef FDCT32x32_2D
#undef FDCT32x32_HIGH_PRECISION #undef FDCT32x32_HIGH_PRECISION
#define FDCT32x32_2D vp9_highbd_fdct32x32_sse2 #define FDCT32x32_2D vp9_highbd_fdct32x32_sse2
#define FDCT32x32_HIGH_PRECISION 1 #define FDCT32x32_HIGH_PRECISION 1
#include "vp9/encoder/x86/vp9_dct32x32_sse2.c" // NOLINT #include "vp9/encoder/x86/vp9_dct32x32_sse2_impl.h" // NOLINT
#undef FDCT32x32_2D #undef FDCT32x32_2D
#undef FDCT32x32_HIGH_PRECISION #undef FDCT32x32_HIGH_PRECISION

Просмотреть файл

@ -134,7 +134,7 @@ 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_dct_sse2.c
VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_dct_ssse3.c VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_dct_ssse3.c
VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2.h VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2.h
VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct32x32_sse2.c VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct32x32_sse2_impl.h
VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_impl_sse2.c VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_impl_sse2.c
ifeq ($(CONFIG_VP9_TEMPORAL_DENOISING),yes) ifeq ($(CONFIG_VP9_TEMPORAL_DENOISING),yes)