ref: 79fcc567813f8d435906068246bae7fd44f0f8b3
parent: 8d5389171f042d2d2cd17f5c8245f315d1708dff
parent: 1c967f17bd9c70da6c7d773aef466703e463d2a7
author: Johann <[email protected]>
date: Wed Jul 1 17:14:41 EDT 2015
Merge "Fix --disable-use-x86inc when used with --enable-vp9-highbitdepth"
--- a/test/vp9_intrapred_test.cc
+++ b/test/vp9_intrapred_test.cc
@@ -131,6 +131,7 @@
#if HAVE_SSE2
#if CONFIG_VP9_HIGHBITDEPTH
+#if CONFIG_USE_X86INC
#if ARCH_X86_64
INSTANTIATE_TEST_CASE_P(SSE2_TO_C_8, VP9IntraPredTest,
::testing::Values(
@@ -179,7 +180,8 @@
&vp9_highbd_tm_predictor_4x4_c, 4, 8),
make_tuple(&vp9_highbd_tm_predictor_8x8_sse2,
&vp9_highbd_tm_predictor_8x8_c, 8, 8)));
-#endif
+#endif // !ARCH_X86_64
+
#if ARCH_X86_64
INSTANTIATE_TEST_CASE_P(SSE2_TO_C_10, VP9IntraPredTest,
::testing::Values(
@@ -235,7 +237,7 @@
&vp9_highbd_tm_predictor_4x4_c, 4, 10),
make_tuple(&vp9_highbd_tm_predictor_8x8_sse2,
&vp9_highbd_tm_predictor_8x8_c, 8, 10)));
-#endif
+#endif // !ARCH_X86_64
#if ARCH_X86_64
INSTANTIATE_TEST_CASE_P(SSE2_TO_C_12, VP9IntraPredTest,
@@ -292,7 +294,8 @@
&vp9_highbd_tm_predictor_4x4_c, 4, 12),
make_tuple(&vp9_highbd_tm_predictor_8x8_sse2,
&vp9_highbd_tm_predictor_8x8_c, 8, 12)));
-#endif
+#endif // !ARCH_X86_64
+#endif // CONFIG_USE_X86INC
#endif // CONFIG_VP9_HIGHBITDEPTH
#endif // HAVE_SSE2
} // namespace
--- a/vp9/common/vp9_rtcd_defs.pl
+++ b/vp9/common/vp9_rtcd_defs.pl
@@ -587,7 +587,7 @@
specialize qw/vp9_highbd_v_predictor_16x16/, "$sse2_x86inc";
add_proto qw/void vp9_highbd_tm_predictor_16x16/, "uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd";
- specialize qw/vp9_highbd_tm_predictor_16x16/, "$sse2_x86_64";
+ specialize qw/vp9_highbd_tm_predictor_16x16/, "$sse2_x86_64_x86inc";
add_proto qw/void vp9_highbd_dc_predictor_16x16/, "uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd";
specialize qw/vp9_highbd_dc_predictor_16x16/, "$sse2_x86inc";
@@ -626,10 +626,10 @@
specialize qw/vp9_highbd_v_predictor_32x32/, "$sse2_x86inc";
add_proto qw/void vp9_highbd_tm_predictor_32x32/, "uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd";
- specialize qw/vp9_highbd_tm_predictor_32x32/, "$sse2_x86_64";
+ specialize qw/vp9_highbd_tm_predictor_32x32/, "$sse2_x86_64_x86inc";
add_proto qw/void vp9_highbd_dc_predictor_32x32/, "uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd";
- specialize qw/vp9_highbd_dc_predictor_32x32/, "$sse2_x86_64";
+ specialize qw/vp9_highbd_dc_predictor_32x32/, "$sse2_x86_64_x86inc";
add_proto qw/void vp9_highbd_dc_top_predictor_32x32/, "uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd";
specialize qw/vp9_highbd_dc_top_predictor_32x32/;