diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/android/README | 2 | ||||
| -rw-r--r-- | test/datarate_test.cc | 8 | ||||
| -rw-r--r-- | test/fdct4x4_test.cc | 7 | ||||
| -rwxr-xr-x | test/tools_common.sh | 4 | ||||
| -rwxr-xr-x | test/vp8cx_set_ref.sh | 54 |
5 files changed, 64 insertions, 11 deletions
diff --git a/test/android/README b/test/android/README index 6840d911c..4a1adcf7f 100644 --- a/test/android/README +++ b/test/android/README @@ -3,7 +3,7 @@ Android.mk will build vpx unittests on android. ./libvpx/configure --target=armv7-android-gcc --enable-external-build \ --enable-postproc --disable-install-srcs --enable-multi-res-encoding \ --enable-temporal-denoising --disable-unit-tests --disable-install-docs \ - --disable-examples --disable-runtime-cpu-detect --sdk=$NDK + --disable-examples --disable-runtime-cpu-detect --sdk-path=$NDK 2) From the parent directory, invoke ndk-build: NDK_PROJECT_PATH=. ndk-build APP_BUILD_SCRIPT=./libvpx/test/android/Android.mk \ diff --git a/test/datarate_test.cc b/test/datarate_test.cc index 2b4aa3acb..80be05ee9 100644 --- a/test/datarate_test.cc +++ b/test/datarate_test.cc @@ -522,10 +522,14 @@ TEST_P(DatarateTestVP9Large, BasicRateTargeting3TemporalLayers) { cfg_.ts_target_bitrate[2] = cfg_.rc_target_bitrate; ASSERT_NO_FATAL_FAILURE(RunLoop(&video)); for (int j = 0; j < static_cast<int>(cfg_.ts_number_layers); ++j) { - ASSERT_GE(effective_datarate_[j], cfg_.ts_target_bitrate[j] * 0.85) + // TODO(yaowu): Work out more stable rc control strategy and + // Adjust the thresholds to be tighter than .75. + ASSERT_GE(effective_datarate_[j], cfg_.ts_target_bitrate[j] * 0.75) << " The datarate for the file is lower than target by too much, " "for layer: " << j; - ASSERT_LE(effective_datarate_[j], cfg_.ts_target_bitrate[j] * 1.15) + // TODO(yaowu): Work out more stable rc control strategy and + // Adjust the thresholds to be tighter than 1.25. + ASSERT_LE(effective_datarate_[j], cfg_.ts_target_bitrate[j] * 1.25) << " The datarate for the file is greater than target by too much, " "for layer: " << j; } diff --git a/test/fdct4x4_test.cc b/test/fdct4x4_test.cc index e2ba8a865..02458db22 100644 --- a/test/fdct4x4_test.cc +++ b/test/fdct4x4_test.cc @@ -353,13 +353,6 @@ INSTANTIATE_TEST_CASE_P( make_tuple(&vp9_fht4x4_c, &vp9_iht4x4_16_add_neon, 3))); #endif -#if HAVE_MMX -INSTANTIATE_TEST_CASE_P( - MMX, Trans4x4WHT, - ::testing::Values( - make_tuple(&vp9_fwht4x4_mmx, &vp9_iwht4x4_16_add_c, 0))); -#endif - #if HAVE_SSE2 INSTANTIATE_TEST_CASE_P( SSE2, Trans4x4DCT, diff --git a/test/tools_common.sh b/test/tools_common.sh index 30f0faea9..9c10d48f0 100755 --- a/test/tools_common.sh +++ b/test/tools_common.sh @@ -18,7 +18,9 @@ set -e devnull='> /dev/null 2>&1' vlog() { - [ "${VPX_TEST_VERBOSE_OUTPUT}" = "yes" ] && echo "$@" + if [ "${VPX_TEST_VERBOSE_OUTPUT}" = "yes" ]; then + echo "$@" + fi } # Sets $VPX_TOOL_TEST to the name specified by positional parameter one. diff --git a/test/vp8cx_set_ref.sh b/test/vp8cx_set_ref.sh new file mode 100755 index 000000000..ef9d0c04c --- /dev/null +++ b/test/vp8cx_set_ref.sh @@ -0,0 +1,54 @@ +#!/bin/sh +## +## Copyright (c) 2014 The WebM project authors. All Rights Reserved. +## +## Use of this source code is governed by a BSD-style license +## that can be found in the LICENSE file in the root of the source +## tree. An additional intellectual property rights grant can be found +## in the file PATENTS. All contributing project authors may +## be found in the AUTHORS file in the root of the source tree. +## +## This file tests the libvpx vp8cx_set_ref example. To add new tests to this +## file, do the following: +## 1. Write a shell function (this is your test). +## 2. Add the function to vp8cx_set_ref_tests (on a new line). +## +. $(dirname $0)/tools_common.sh + +# Environment check: $YUV_RAW_INPUT is required. +vp8cx_set_ref_verify_environment() { + if [ ! -e "${YUV_RAW_INPUT}" ]; then + echo "Libvpx test data must exist in LIBVPX_TEST_DATA_PATH." + return 1 + fi +} + +# Runs vp8cx_set_ref and updates the reference frame before encoding frame 90. +# $1 is the codec name, which vp8cx_set_ref does not support at present: It's +# currently used only to name the output file. +# TODO(tomfinegan): Pass the codec param once the example is updated to support +# VP9. +vpx_set_ref() { + local encoder="${LIBVPX_BIN_PATH}/vp8cx_set_ref${VPX_TEST_EXE_SUFFIX}" + local codec="$1" + local output_file="${VPX_TEST_OUTPUT_DIR}/vp8cx_set_ref_${codec}.ivf" + local ref_frame_num=90 + + [ -x "${encoder}" ] || return 1 + + eval "${encoder}" "${YUV_RAW_INPUT_WIDTH}" "${YUV_RAW_INPUT_HEIGHT}" \ + "${YUV_RAW_INPUT}" "${output_file}" "${ref_frame_num}" \ + ${devnull} + + [ -e "${output_file}" ] || return 1 +} + +vp8cx_set_ref_vp8() { + if [ "$(vp8_encode_available)" = "yes" ]; then + vpx_set_ref vp8 || return 1 + fi +} + +vp8cx_set_ref_tests="vp8cx_set_ref_vp8" + +run_tests vp8cx_set_ref_verify_environment "${vp8cx_set_ref_tests}" |