shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge changes I89a8440f,Ifa3926e1

* changes:
  libs.mk: relocate TEST_INTRA_PRED_SPEED_OBJS init
  test_intra_pred_speed: remove #if w/in another macro

--- a/libs.mk

+++ b/libs.mk

@@ -373,6 +373,7 @@

 TEST_INTRA_PRED_SPEED_BIN=./test_intra_pred_speed$(EXE_SFX)

 TEST_INTRA_PRED_SPEED_SRCS=$(addprefix test/,$(call enabled,TEST_INTRA_PRED_SPEED_SRCS))

+TEST_INTRA_PRED_SPEED_OBJS := $(sort $(call objs,$(TEST_INTRA_PRED_SPEED_SRCS)))

 libvpx_test_srcs.txt:

 	@echo "    [CREATE] $@"

@@ -486,7 +487,6 @@

               $(LIBVPX_TEST_OBJS) \

               -L. -lvpx -lgtest $(extralibs) -lm))

-TEST_INTRA_PRED_SPEED_OBJS := $(sort $(call objs,$(TEST_INTRA_PRED_SPEED_SRCS)))

 ifneq ($(strip $(TEST_INTRA_PRED_SPEED_OBJS)),)

 $(TEST_INTRA_PRED_SPEED_OBJS) $(TEST_INTRA_PRED_SPEED_OBJS:.o=.d): CXXFLAGS += $(GTEST_INCLUDES)

 OBJS-yes += $(TEST_INTRA_PRED_SPEED_OBJS)

--- a/test/test_intra_pred_speed.cc

+++ b/test/test_intra_pred_speed.cc

@@ -311,17 +311,20 @@

                 vp9_d63_predictor_32x32_c, vp9_tm_predictor_32x32_c)

 #if HAVE_SSE2

+#if ARCH_X86_64

 INTRA_PRED_TEST(SSE2, TestIntraPred32, vp9_dc_predictor_32x32_sse2,

                 vp9_dc_left_predictor_32x32_sse2,

                 vp9_dc_top_predictor_32x32_sse2,

                 vp9_dc_128_predictor_32x32_sse2, vp9_v_predictor_32x32_sse2,

                 NULL, NULL, NULL, NULL, NULL, NULL, NULL,

-#if ARCH_X86_64

-                vp9_tm_predictor_32x32_sse2

+                vp9_tm_predictor_32x32_sse2)

 #else

-                NULL

-#endif

-               )

+INTRA_PRED_TEST(SSE2, TestIntraPred32, vp9_dc_predictor_32x32_sse2,

+                vp9_dc_left_predictor_32x32_sse2,

+                vp9_dc_top_predictor_32x32_sse2,

+                vp9_dc_128_predictor_32x32_sse2, vp9_v_predictor_32x32_sse2,

+                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL)

+#endif  // ARCH_X86_64

 #endif  // HAVE_SSE2

 #if HAVE_SSSE3