diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/android/Android.mk | 8 | ||||
| -rw-r--r-- | test/borders_test.cc | 1 | ||||
| -rw-r--r-- | test/cpu_speed_test.cc | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/test/android/Android.mk b/test/android/Android.mk index 13af601e2..4e750b24b 100644 --- a/test/android/Android.mk +++ b/test/android/Android.mk @@ -14,8 +14,14 @@ CUR_WD := $(call my-dir) BINDINGS_DIR := $(CUR_WD)/../../.. LOCAL_PATH := $(CUR_WD)/../../.. +#libwebm +include $(CLEAR_VARS) +include $(BINDINGS_DIR)/libvpx/third_party/libwebm/Android.mk +LOCAL_PATH := $(CUR_WD)/../../.. + #libvpx include $(CLEAR_VARS) +LOCAL_STATIC_LIBRARIES := libwebm include $(BINDINGS_DIR)/libvpx/build/make/Android.mk LOCAL_PATH := $(CUR_WD)/../.. @@ -33,7 +39,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_ARM_MODE := arm LOCAL_MODULE := libvpx_test -LOCAL_STATIC_LIBRARIES := gtest +LOCAL_STATIC_LIBRARIES := gtest libwebm LOCAL_SHARED_LIBRARIES := vpx include $(LOCAL_PATH)/test/test.mk LOCAL_C_INCLUDES := $(BINDINGS_DIR) diff --git a/test/borders_test.cc b/test/borders_test.cc index a2f5a1bdd..b30be4580 100644 --- a/test/borders_test.cc +++ b/test/borders_test.cc @@ -35,6 +35,7 @@ class BordersTest : public ::libvpx_test::EncoderTest, encoder->Control(VP8E_SET_ENABLEAUTOALTREF, 1); encoder->Control(VP8E_SET_ARNR_MAXFRAMES, 7); encoder->Control(VP8E_SET_ARNR_STRENGTH, 5); + encoder->Control(VP8E_SET_ARNR_TYPE, 3); } } diff --git a/test/cpu_speed_test.cc b/test/cpu_speed_test.cc index ca201bbc7..be651b4fe 100644 --- a/test/cpu_speed_test.cc +++ b/test/cpu_speed_test.cc @@ -37,6 +37,7 @@ class CpuSpeedTest : public ::libvpx_test::EncoderTest, encoder->Control(VP8E_SET_ENABLEAUTOALTREF, 1); encoder->Control(VP8E_SET_ARNR_MAXFRAMES, 7); encoder->Control(VP8E_SET_ARNR_STRENGTH, 5); + encoder->Control(VP8E_SET_ARNR_TYPE, 3); } } |