diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2013-08-05 17:27:30 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-08-06 06:23:38 -0700 |
| commit | 62c6aa884da8aee73996f7731cea83dc3c925194 (patch) | |
| tree | 26778ed900d14bbf225fa968bd372dd250da4dd1 | |
| parent | a93b115cd6e536587b5c5e78a4b79601206f26a0 (diff) | |
| download | libvpx-62c6aa884da8aee73996f7731cea83dc3c925194.tar libvpx-62c6aa884da8aee73996f7731cea83dc3c925194.tar.gz libvpx-62c6aa884da8aee73996f7731cea83dc3c925194.tar.bz2 libvpx-62c6aa884da8aee73996f7731cea83dc3c925194.zip | |
block error / x86inc mods
Change-Id: Icb607745634e10b9bac5019d06661ece09fcdb40
| -rw-r--r-- | test/vp9_subtract_test.cc | 1 | ||||
| -rw-r--r-- | vp9/common/vp9_rtcd_defs.sh | 2 | ||||
| -rw-r--r-- | vp9/vp9cx.mk | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/test/vp9_subtract_test.cc b/test/vp9_subtract_test.cc index dbe37563c..24767957f 100644 --- a/test/vp9_subtract_test.cc +++ b/test/vp9_subtract_test.cc @@ -97,5 +97,4 @@ INSTANTIATE_TEST_CASE_P(C, VP9SubtractBlockTest, INSTANTIATE_TEST_CASE_P(SSE2, VP9SubtractBlockTest, ::testing::Values(vp9_subtract_block_sse2)); #endif - } // namespace vp9 diff --git a/vp9/common/vp9_rtcd_defs.sh b/vp9/common/vp9_rtcd_defs.sh index 5ada2260d..6bb3cb888 100644 --- a/vp9/common/vp9_rtcd_defs.sh +++ b/vp9/common/vp9_rtcd_defs.sh @@ -701,7 +701,7 @@ specialize vp9_get_mb_ss mmx sse2 # ENCODEMB INVOKE prototype int64_t vp9_block_error "int16_t *coeff, int16_t *dqcoeff, intptr_t block_size, int64_t *ssz" -specialize vp9_block_error sse2 +specialize vp9_block_error $sse2_x86inc prototype void vp9_subtract_block "int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride" specialize vp9_subtract_block $sse2_x86inc diff --git a/vp9/vp9cx.mk b/vp9/vp9cx.mk index bd0792d67..288c0d829 100644 --- a/vp9/vp9cx.mk +++ b/vp9/vp9cx.mk @@ -83,12 +83,12 @@ VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_variance_impl_sse2.asm VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad_sse2.asm VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad4d_sse2.asm VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subpel_variance.asm -VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_error_sse2.asm VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subpel_variance_impl_sse2.asm VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_temporal_filter_apply_sse2.asm VP9_CX_SRCS-$(HAVE_SSE3) += encoder/x86/vp9_sad_sse3.asm ifeq ($(USE_X86INC),yes) +VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_error_sse2.asm VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subtract_sse2.asm endif |