diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/sad_test.cc | 11 | ||||
| -rwxr-xr-x | test/simple_encoder.sh | 11 | ||||
| -rwxr-xr-x | test/twopass_encoder.sh | 12 | ||||
| -rw-r--r-- | test/variance_test.cc | 14 |
4 files changed, 9 insertions, 39 deletions
diff --git a/test/sad_test.cc b/test/sad_test.cc index 3f0f74cae..e6bd0d793 100644 --- a/test/sad_test.cc +++ b/test/sad_test.cc @@ -689,17 +689,6 @@ INSTANTIATE_TEST_CASE_P(NEON, SADx4Test, ::testing::ValuesIn(x4d_neon_tests)); //------------------------------------------------------------------------------ // x86 functions -#if HAVE_MMX -const SadMxNParam mmx_tests[] = { - make_tuple(16, 16, &vpx_sad16x16_mmx, -1), - make_tuple(16, 8, &vpx_sad16x8_mmx, -1), - make_tuple(8, 16, &vpx_sad8x16_mmx, -1), - make_tuple(8, 8, &vpx_sad8x8_mmx, -1), - make_tuple(4, 4, &vpx_sad4x4_mmx, -1), -}; -INSTANTIATE_TEST_CASE_P(MMX, SADTest, ::testing::ValuesIn(mmx_tests)); -#endif // HAVE_MMX - #if HAVE_SSE2 #if CONFIG_USE_X86INC const SadMxNParam sse2_tests[] = { diff --git a/test/simple_encoder.sh b/test/simple_encoder.sh index c4a628030..ee633ae99 100755 --- a/test/simple_encoder.sh +++ b/test/simple_encoder.sh @@ -23,7 +23,7 @@ simple_encoder_verify_environment() { fi } -# Runs simple_encoder using the codec specified by $1. +# Runs simple_encoder using the codec specified by $1 with a frame limit of 100. simple_encoder() { local encoder="${LIBVPX_BIN_PATH}/simple_encoder${VPX_TEST_EXE_SUFFIX}" local codec="$1" @@ -35,7 +35,7 @@ simple_encoder() { fi eval "${VPX_TEST_PREFIX}" "${encoder}" "${codec}" "${YUV_RAW_INPUT_WIDTH}" \ - "${YUV_RAW_INPUT_HEIGHT}" "${YUV_RAW_INPUT}" "${output_file}" 9999 \ + "${YUV_RAW_INPUT_HEIGHT}" "${YUV_RAW_INPUT}" "${output_file}" 9999 0 100 \ ${devnull} [ -e "${output_file}" ] || return 1 @@ -47,16 +47,13 @@ simple_encoder_vp8() { fi } -# TODO(tomfinegan): Add a frame limit param to simple_encoder and enable this -# test. VP9 is just too slow right now: This test takes 4m30s+ on a fast -# machine. -DISABLED_simple_encoder_vp9() { +simple_encoder_vp9() { if [ "$(vp9_encode_available)" = "yes" ]; then simple_encoder vp9 || return 1 fi } simple_encoder_tests="simple_encoder_vp8 - DISABLED_simple_encoder_vp9" + simple_encoder_vp9" run_tests simple_encoder_verify_environment "${simple_encoder_tests}" diff --git a/test/twopass_encoder.sh b/test/twopass_encoder.sh index 1189e5131..7a223f2af 100755 --- a/test/twopass_encoder.sh +++ b/test/twopass_encoder.sh @@ -23,7 +23,8 @@ twopass_encoder_verify_environment() { fi } -# Runs twopass_encoder using the codec specified by $1. +# Runs twopass_encoder using the codec specified by $1 with a frame limit of +# 100. twopass_encoder() { local encoder="${LIBVPX_BIN_PATH}/twopass_encoder${VPX_TEST_EXE_SUFFIX}" local codec="$1" @@ -35,7 +36,7 @@ twopass_encoder() { fi eval "${VPX_TEST_PREFIX}" "${encoder}" "${codec}" "${YUV_RAW_INPUT_WIDTH}" \ - "${YUV_RAW_INPUT_HEIGHT}" "${YUV_RAW_INPUT}" "${output_file}" \ + "${YUV_RAW_INPUT_HEIGHT}" "${YUV_RAW_INPUT}" "${output_file}" 100 \ ${devnull} [ -e "${output_file}" ] || return 1 @@ -47,16 +48,13 @@ twopass_encoder_vp8() { fi } -# TODO(tomfinegan): Add a frame limit param to twopass_encoder and enable this -# test. VP9 is just too slow right now: This test takes 31m16s+ on a fast -# machine. -DISABLED_twopass_encoder_vp9() { +twopass_encoder_vp9() { if [ "$(vp9_encode_available)" = "yes" ]; then twopass_encoder vp9 || return 1 fi } twopass_encoder_tests="twopass_encoder_vp8 - DISABLED_twopass_encoder_vp9" + twopass_encoder_vp9" run_tests twopass_encoder_verify_environment "${twopass_encoder_tests}" diff --git a/test/variance_test.cc b/test/variance_test.cc index a9ca07cf4..a6efc92d7 100644 --- a/test/variance_test.cc +++ b/test/variance_test.cc @@ -977,20 +977,6 @@ INSTANTIATE_TEST_CASE_P( #endif // CONFIG_VP9_HIGHBITDEPTH #if HAVE_MMX -INSTANTIATE_TEST_CASE_P(MMX, VpxMseTest, - ::testing::Values(make_tuple(4, 4, &vpx_mse16x16_mmx))); - -INSTANTIATE_TEST_CASE_P(MMX, SumOfSquaresTest, - ::testing::Values(vpx_get_mb_ss_mmx)); - -INSTANTIATE_TEST_CASE_P( - MMX, VpxVarianceTest, - ::testing::Values(make_tuple(4, 4, &vpx_variance16x16_mmx, 0), - make_tuple(4, 3, &vpx_variance16x8_mmx, 0), - make_tuple(3, 4, &vpx_variance8x16_mmx, 0), - make_tuple(3, 3, &vpx_variance8x8_mmx, 0), - make_tuple(2, 2, &vpx_variance4x4_mmx, 0))); - INSTANTIATE_TEST_CASE_P( MMX, VpxSubpelVarianceTest, ::testing::Values(make_tuple(4, 4, &vpx_sub_pixel_variance16x16_mmx, 0), |