diff options
author | hkuang <hkuang@google.com> | 2013-11-14 16:48:58 -0800 |
---|---|---|
committer | hkuang <hkuang@google.com> | 2013-11-14 16:48:58 -0800 |
commit | 9b35249446b07f40ac5fcc3205f2c048616efacc (patch) | |
tree | fe2ffa7c55b8d1f84a3e97e7fd68a0d484d669dc /libvpx/test | |
parent | 5ae7ac49f08a179e4f054d99fcfc9dce78d26e58 (diff) | |
download | android_external_libvpx-9b35249446b07f40ac5fcc3205f2c048616efacc.tar.gz android_external_libvpx-9b35249446b07f40ac5fcc3205f2c048616efacc.tar.bz2 android_external_libvpx-9b35249446b07f40ac5fcc3205f2c048616efacc.zip |
Roll latest libvpx to fix scalling bug.
Checkout is from master:Ib748eb287520c794631697204da6ebe19523ce95
Bug: 11690668
Change-Id: Ia2bde2e50feca81556563ad3797e4972748e2041
Diffstat (limited to 'libvpx/test')
-rw-r--r-- | libvpx/test/android/Android.mk | 42 | ||||
-rw-r--r-- | libvpx/test/android/README | 32 | ||||
-rw-r--r-- | libvpx/test/android/get_files.py | 118 | ||||
-rw-r--r-- | libvpx/test/datarate_test.cc | 4 | ||||
-rw-r--r-- | libvpx/test/fdct4x4_test.cc | 378 | ||||
-rw-r--r-- | libvpx/test/svc_test.cc | 101 | ||||
-rw-r--r-- | libvpx/test/test-data.sha1 | 4 | ||||
-rw-r--r-- | libvpx/test/test.mk | 4 | ||||
-rw-r--r-- | libvpx/test/test_vector_test.cc | 1 | ||||
-rw-r--r-- | libvpx/test/vp9_lossless_test.cc | 6 |
10 files changed, 518 insertions, 172 deletions
diff --git a/libvpx/test/android/Android.mk b/libvpx/test/android/Android.mk new file mode 100644 index 0000000..13af601 --- /dev/null +++ b/libvpx/test/android/Android.mk @@ -0,0 +1,42 @@ +# Copyright (c) 2013 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 make file builds vpx_test app for android. +# The test app itself runs on the command line through adb shell +# The paths are really messed up as the libvpx make file +# expects to be made from a parent directory. +CUR_WD := $(call my-dir) +BINDINGS_DIR := $(CUR_WD)/../../.. +LOCAL_PATH := $(CUR_WD)/../../.. + +#libvpx +include $(CLEAR_VARS) +include $(BINDINGS_DIR)/libvpx/build/make/Android.mk +LOCAL_PATH := $(CUR_WD)/../.. + +#libgtest +include $(CLEAR_VARS) +LOCAL_ARM_MODE := arm +LOCAL_CPP_EXTENSION := .cc +LOCAL_MODULE := gtest +LOCAL_C_INCLUDES := $(LOCAL_PATH)/third_party/googletest/src/ +LOCAL_C_INCLUDES += $(LOCAL_PATH)/third_party/googletest/src/include/ +LOCAL_SRC_FILES := ./third_party/googletest/src/src/gtest-all.cc +include $(BUILD_STATIC_LIBRARY) + +#libvpx_test +include $(CLEAR_VARS) +LOCAL_ARM_MODE := arm +LOCAL_MODULE := libvpx_test +LOCAL_STATIC_LIBRARIES := gtest +LOCAL_SHARED_LIBRARIES := vpx +include $(LOCAL_PATH)/test/test.mk +LOCAL_C_INCLUDES := $(BINDINGS_DIR) +FILTERED_SRC := $(sort $(filter %.cc %.c, $(LIBVPX_TEST_SRCS-yes))) +LOCAL_SRC_FILES := $(addprefix ./test/, $(FILTERED_SRC)) +include $(BUILD_EXECUTABLE) diff --git a/libvpx/test/android/README b/libvpx/test/android/README new file mode 100644 index 0000000..6840d91 --- /dev/null +++ b/libvpx/test/android/README @@ -0,0 +1,32 @@ +Android.mk will build vpx unittests on android. +1) Configure libvpx from the parent directory: +./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 + +2) From the parent directory, invoke ndk-build: +NDK_PROJECT_PATH=. ndk-build APP_BUILD_SCRIPT=./libvpx/test/android/Android.mk \ + APP_ABI=armeabi-v7a APP_PLATFORM=android-18 APP_OPTIM=release \ + APP_STL=gnustl_static + +Note: Both adb and ndk-build are available prebuilt at: + https://chromium.googlesource.com/android_tools + +3) Run get_files.py to download the test files: +python get_files.py -i /path/to/test-data.sha1 -o /path/to/put/files \ + -u http://downloads.webmproject.org/test_data/libvpx + +4) Transfer files to device using adb. Ensure you have proper permissions for +the target + +adb push /path/to/test_files /data/local/tmp +adb push /path/to/built_libs /data/local/tmp + +NOTE: Built_libs defaults to parent_dir/libs/armeabi-v7a + +5) Run tests: +adb shell +(on device) +cd /data/local/tmp +LD_LIBRARY_PATH=. ./vpx_test diff --git a/libvpx/test/android/get_files.py b/libvpx/test/android/get_files.py new file mode 100644 index 0000000..1c69740 --- /dev/null +++ b/libvpx/test/android/get_files.py @@ -0,0 +1,118 @@ +# Copyright (c) 2013 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 simple script pulls test files from the webm homepage +# It is intelligent enough to only pull files if +# 1) File / test_data folder does not exist +# 2) SHA mismatch + +import pycurl +import csv +import hashlib +import re +import os.path +import time +import itertools +import sys +import getopt + +#globals +url = '' +file_list_path = '' +local_resource_path = '' + +# Helper functions: +# A simple function which returns the sha hash of a file in hex +def get_file_sha(filename): + try: + sha_hash = hashlib.sha1() + with open(filename, 'rb') as file: + buf = file.read(HASH_CHUNK) + while len(buf) > 0: + sha_hash.update(buf) + buf = file.read(HASH_CHUNK) + return sha_hash.hexdigest() + except IOError: + print "Error reading " + filename + +# Downloads a file from a url, and then checks the sha against the passed +# in sha +def download_and_check_sha(url, filename, sha): + path = os.path.join(local_resource_path, filename) + fp = open(path, "wb") + curl = pycurl.Curl() + curl.setopt(pycurl.URL, url + "/" + filename) + curl.setopt(pycurl.WRITEDATA, fp) + curl.perform() + curl.close() + fp.close() + return get_file_sha(path) == sha + +#constants +ftp_retries = 3 + +SHA_COL = 0 +NAME_COL = 1 +EXPECTED_COL = 2 +HASH_CHUNK = 65536 + +# Main script +try: + opts, args = \ + getopt.getopt(sys.argv[1:], \ + "u:i:o:", ["url=", "input_csv=", "output_dir="]) +except: + print 'get_files.py -u <url> -i <input_csv> -o <output_dir>' + sys.exit(2) + +for opt, arg in opts: + if opt == '-u': + url = arg + elif opt in ("-i", "--input_csv"): + file_list_path = os.path.join(arg) + elif opt in ("-o", "--output_dir"): + local_resource_path = os.path.join(arg) + +if len(sys.argv) != 7: + print "Expects two paths and a url!" + exit(1) + +if not os.path.isdir(local_resource_path): + os.makedirs(local_resource_path) + +file_list_csv = open(file_list_path, "rb") + +# Our 'csv' file uses multiple spaces as a delimiter, python's +# csv class only uses single character delimiters, so we convert them below +file_list_reader = csv.reader((re.sub(' +', ' ', line) \ + for line in file_list_csv), delimiter = ' ') + +file_shas = [] +file_names = [] + +for row in file_list_reader: + if len(row) != EXPECTED_COL: + continue + file_shas.append(row[SHA_COL]) + file_names.append(row[NAME_COL]) + +file_list_csv.close() + +# Download files, only if they don't already exist and have correct shas +for filename, sha in itertools.izip(file_names, file_shas): + path = os.path.join(local_resource_path, filename) + if os.path.isfile(path) \ + and get_file_sha(path) == sha: + print path + ' exists, skipping' + continue + for retry in range(0, ftp_retries): + print "Downloading " + path + if not download_and_check_sha(url, filename, sha): + print "Sha does not match, retrying..." + else: + break diff --git a/libvpx/test/datarate_test.cc b/libvpx/test/datarate_test.cc index 85f4bb6..5785a0a 100644 --- a/libvpx/test/datarate_test.cc +++ b/libvpx/test/datarate_test.cc @@ -248,9 +248,9 @@ TEST_P(DatarateTestVP9, BasicRateTargeting) { cfg_.rc_target_bitrate = i; ResetModel(); ASSERT_NO_FATAL_FAILURE(RunLoop(&video)); - ASSERT_GE(cfg_.rc_target_bitrate, effective_datarate_ * 0.8) + ASSERT_GE(cfg_.rc_target_bitrate, effective_datarate_ * 0.9) << " The datarate for the file exceeds the target by too much!"; - ASSERT_LE(cfg_.rc_target_bitrate, effective_datarate_ * 1.3) + ASSERT_LE(cfg_.rc_target_bitrate, effective_datarate_ * 1.1) << " The datarate for the file missed the target!"; } } diff --git a/libvpx/test/fdct4x4_test.cc b/libvpx/test/fdct4x4_test.cc index 796a2e9..9d8b0bd 100644 --- a/libvpx/test/fdct4x4_test.cc +++ b/libvpx/test/fdct4x4_test.cc @@ -13,178 +13,288 @@ #include <string.h> #include "third_party/googletest/src/include/gtest/gtest.h" +#include "test/acm_random.h" +#include "test/clear_system_state.h" +#include "test/register_state_check.h" +#include "test/util.h" extern "C" { +#include "vp9/common/vp9_entropy.h" #include "./vp9_rtcd.h" +void vp9_idct4x4_16_add_c(const int16_t *input, uint8_t *output, int pitch); } - -#include "test/acm_random.h" #include "vpx/vpx_integer.h" -#include "vpx_ports/mem.h" using libvpx_test::ACMRandom; namespace { -void fdct4x4(int16_t *in, int16_t *out, uint8_t* /*dst*/, - int stride, int /*tx_type*/) { +const int kNumCoeffs = 16; +typedef void (*fdct_t)(const int16_t *in, int16_t *out, int stride); +typedef void (*idct_t)(const int16_t *in, uint8_t *out, int stride); +typedef void (*fht_t) (const int16_t *in, int16_t *out, int stride, + int tx_type); +typedef void (*iht_t) (const int16_t *in, uint8_t *out, int stride, + int tx_type); + +void fdct4x4_ref(const int16_t *in, int16_t *out, int stride, int tx_type) { vp9_fdct4x4_c(in, out, stride); } -void idct4x4_add(int16_t* /*in*/, int16_t *out, uint8_t *dst, - int stride, int /*tx_type*/) { - vp9_idct4x4_16_add_c(out, dst, stride); -} -void fht4x4(int16_t *in, int16_t *out, uint8_t* /*dst*/, - int stride, int tx_type) { + +void fht4x4_ref(const int16_t *in, int16_t *out, int stride, int tx_type) { vp9_short_fht4x4_c(in, out, stride, tx_type); } -void iht4x4_add(int16_t* /*in*/, int16_t *out, uint8_t *dst, - int stride, int tx_type) { - vp9_iht4x4_16_add_c(out, dst, stride, tx_type); -} -class FwdTrans4x4Test : public ::testing::TestWithParam<int> { +class Trans4x4TestBase { public: - virtual ~FwdTrans4x4Test() {} - virtual void SetUp() { - tx_type_ = GetParam(); - if (tx_type_ == 0) { - fwd_txfm_ = fdct4x4; - inv_txfm_ = idct4x4_add; - } else { - fwd_txfm_ = fht4x4; - inv_txfm_ = iht4x4_add; - } - } + virtual ~Trans4x4TestBase() {} protected: - void RunFwdTxfm(int16_t *in, int16_t *out, uint8_t *dst, - int stride, int tx_type) { - (*fwd_txfm_)(in, out, dst, stride, tx_type); - } + virtual void RunFwdTxfm(const int16_t *in, int16_t *out, int stride) = 0; + + virtual void RunInvTxfm(const int16_t *out, uint8_t *dst, int stride) = 0; + + void RunAccuracyCheck() { + ACMRandom rnd(ACMRandom::DeterministicSeed()); + uint32_t max_error = 0; + int64_t total_error = 0; + const int count_test_block = 10000; + for (int i = 0; i < count_test_block; ++i) { + DECLARE_ALIGNED_ARRAY(16, int16_t, test_input_block, kNumCoeffs); + DECLARE_ALIGNED_ARRAY(16, int16_t, test_temp_block, kNumCoeffs); + DECLARE_ALIGNED_ARRAY(16, uint8_t, dst, kNumCoeffs); + DECLARE_ALIGNED_ARRAY(16, uint8_t, src, kNumCoeffs); + + // Initialize a test block with input range [-255, 255]. + for (int j = 0; j < kNumCoeffs; ++j) { + src[j] = rnd.Rand8(); + dst[j] = rnd.Rand8(); + test_input_block[j] = src[j] - dst[j]; + } + + REGISTER_STATE_CHECK(RunFwdTxfm(test_input_block, + test_temp_block, pitch_)); + REGISTER_STATE_CHECK(RunInvTxfm(test_temp_block, dst, pitch_)); + + for (int j = 0; j < kNumCoeffs; ++j) { + const uint32_t diff = dst[j] - src[j]; + const uint32_t error = diff * diff; + if (max_error < error) + max_error = error; + total_error += error; + } + } - void RunInvTxfm(int16_t *in, int16_t *out, uint8_t *dst, - int stride, int tx_type) { - (*inv_txfm_)(in, out, dst, stride, tx_type); + EXPECT_GE(1u, max_error) + << "Error: 4x4 FHT/IHT has an individual round trip error > 1"; + + EXPECT_GE(count_test_block , total_error) + << "Error: 4x4 FHT/IHT has average round trip error > 1 per block"; } - int tx_type_; - void (*fwd_txfm_)(int16_t *in, int16_t *out, uint8_t *dst, - int stride, int tx_type); - void (*inv_txfm_)(int16_t *in, int16_t *out, uint8_t *dst, - int stride, int tx_type); -}; + void RunCoeffCheck() { + ACMRandom rnd(ACMRandom::DeterministicSeed()); + const int count_test_block = 5000; + DECLARE_ALIGNED_ARRAY(16, int16_t, input_block, kNumCoeffs); + DECLARE_ALIGNED_ARRAY(16, int16_t, output_ref_block, kNumCoeffs); + DECLARE_ALIGNED_ARRAY(16, int16_t, output_block, kNumCoeffs); + + for (int i = 0; i < count_test_block; ++i) { + // Initialize a test block with input range [-255, 255]. + for (int j = 0; j < kNumCoeffs; ++j) + input_block[j] = rnd.Rand8() - rnd.Rand8(); + + fwd_txfm_ref(input_block, output_ref_block, pitch_, tx_type_); + REGISTER_STATE_CHECK(RunFwdTxfm(input_block, output_block, pitch_)); -TEST_P(FwdTrans4x4Test, SignBiasCheck) { - ACMRandom rnd(ACMRandom::DeterministicSeed()); - DECLARE_ALIGNED_ARRAY(16, int16_t, test_input_block, 16); - DECLARE_ALIGNED_ARRAY(16, int16_t, test_output_block, 16); - const int pitch = 4; - int count_sign_block[16][2]; - const int count_test_block = 1000000; - - memset(count_sign_block, 0, sizeof(count_sign_block)); - for (int i = 0; i < count_test_block; ++i) { - // Initialize a test block with input range [-255, 255]. - for (int j = 0; j < 16; ++j) - test_input_block[j] = rnd.Rand8() - rnd.Rand8(); - - RunFwdTxfm(test_input_block, test_output_block, NULL, pitch, tx_type_); - - for (int j = 0; j < 16; ++j) { - if (test_output_block[j] < 0) - ++count_sign_block[j][0]; - else if (test_output_block[j] > 0) - ++count_sign_block[j][1]; + // The minimum quant value is 4. + for (int j = 0; j < kNumCoeffs; ++j) + EXPECT_EQ(output_block[j], output_ref_block[j]); } } - for (int j = 0; j < 16; ++j) { - const bool bias_acceptable = (abs(count_sign_block[j][0] - - count_sign_block[j][1]) < 10000); - EXPECT_TRUE(bias_acceptable) - << "Error: 4x4 FDCT/FHT has a sign bias > 1%" - << " for input range [-255, 255] at index " << j - << " tx_type " << tx_type_; + void RunMemCheck() { + ACMRandom rnd(ACMRandom::DeterministicSeed()); + const int count_test_block = 5000; + DECLARE_ALIGNED_ARRAY(16, int16_t, input_block, kNumCoeffs); + DECLARE_ALIGNED_ARRAY(16, int16_t, input_extreme_block, kNumCoeffs); + DECLARE_ALIGNED_ARRAY(16, int16_t, output_ref_block, kNumCoeffs); + DECLARE_ALIGNED_ARRAY(16, int16_t, output_block, kNumCoeffs); + + for (int i = 0; i < count_test_block; ++i) { + // Initialize a test block with input range [-255, 255]. + for (int j = 0; j < kNumCoeffs; ++j) { + input_block[j] = rnd.Rand8() - rnd.Rand8(); + input_extreme_block[j] = rnd.Rand8() % 2 ? 255 : -255; + } + if (i == 0) + for (int j = 0; j < kNumCoeffs; ++j) + input_extreme_block[j] = 255; + if (i == 1) + for (int j = 0; j < kNumCoeffs; ++j) + input_extreme_block[j] = -255; + + fwd_txfm_ref(input_extreme_block, output_ref_block, pitch_, tx_type_); + REGISTER_STATE_CHECK(RunFwdTxfm(input_extreme_block, + output_block, pitch_)); + + // The minimum quant value is 4. + for (int j = 0; j < kNumCoeffs; ++j) { + EXPECT_EQ(output_block[j], output_ref_block[j]); + EXPECT_GE(4 * DCT_MAX_VALUE, abs(output_block[j])) + << "Error: 16x16 FDCT has coefficient larger than 4*DCT_MAX_VALUE"; + } + } } - memset(count_sign_block, 0, sizeof(count_sign_block)); - for (int i = 0; i < count_test_block; ++i) { - // Initialize a test block with input range [-15, 15]. - for (int j = 0; j < 16; ++j) - test_input_block[j] = (rnd.Rand8() >> 4) - (rnd.Rand8() >> 4); + void RunInvAccuracyCheck() { + ACMRandom rnd(ACMRandom::DeterministicSeed()); + const int count_test_block = 1000; + DECLARE_ALIGNED_ARRAY(16, int16_t, in, kNumCoeffs); + DECLARE_ALIGNED_ARRAY(16, int16_t, coeff, kNumCoeffs); + DECLARE_ALIGNED_ARRAY(16, uint8_t, dst, kNumCoeffs); + DECLARE_ALIGNED_ARRAY(16, uint8_t, src, kNumCoeffs); - RunFwdTxfm(test_input_block, test_output_block, NULL, pitch, tx_type_); + for (int i = 0; i < count_test_block; ++i) { + // Initialize a test block with input range [-255, 255]. + for (int j = 0; j < kNumCoeffs; ++j) { + src[j] = rnd.Rand8(); + dst[j] = rnd.Rand8(); + in[j] = src[j] - dst[j]; + } - for (int j = 0; j < 16; ++j) { - if (test_output_block[j] < 0) - ++count_sign_block[j][0]; - else if (test_output_block[j] > 0) - ++count_sign_block[j][1]; + fwd_txfm_ref(in, coeff, pitch_, tx_type_); + + REGISTER_STATE_CHECK(RunInvTxfm(coeff, dst, pitch_)); + + for (int j = 0; j < kNumCoeffs; ++j) { + const uint32_t diff = dst[j] - src[j]; + const uint32_t error = diff * diff; + EXPECT_GE(1u, error) + << "Error: 16x16 IDCT has error " << error + << " at index " << j; + } } } - for (int j = 0; j < 16; ++j) { - const bool bias_acceptable = (abs(count_sign_block[j][0] - - count_sign_block[j][1]) < 100000); - EXPECT_TRUE(bias_acceptable) - << "Error: 4x4 FDCT/FHT has a sign bias > 10%" - << " for input range [-15, 15] at index " << j; + int pitch_; + int tx_type_; + fht_t fwd_txfm_ref; +}; + +class Trans4x4DCT + : public Trans4x4TestBase, + public PARAMS(fdct_t, idct_t, int) { + public: + virtual ~Trans4x4DCT() {} + + virtual void SetUp() { + fwd_txfm_ = GET_PARAM(0); + inv_txfm_ = GET_PARAM(1); + tx_type_ = GET_PARAM(2); + pitch_ = 4; + fwd_txfm_ref = fdct4x4_ref; } + virtual void TearDown() { libvpx_test::ClearSystemState(); } + + protected: + void RunFwdTxfm(const int16_t *in, int16_t *out, int stride) { + fwd_txfm_(in, out, stride); + } + void RunInvTxfm(const int16_t *out, uint8_t *dst, int stride) { + inv_txfm_(out, dst, stride); + } + + fdct_t fwd_txfm_; + idct_t inv_txfm_; +}; + +TEST_P(Trans4x4DCT, AccuracyCheck) { + RunAccuracyCheck(); } -TEST_P(FwdTrans4x4Test, RoundTripErrorCheck) { - ACMRandom rnd(ACMRandom::DeterministicSeed()); - - int max_error = 0; - int total_error = 0; - const int count_test_block = 1000000; - for (int i = 0; i < count_test_block; ++i) { - DECLARE_ALIGNED_ARRAY(16, int16_t, test_input_block, 16); - DECLARE_ALIGNED_ARRAY(16, int16_t, test_temp_block, 16); - DECLARE_ALIGNED_ARRAY(16, uint8_t, dst, 16); - DECLARE_ALIGNED_ARRAY(16, uint8_t, src, 16); - - for (int j = 0; j < 16; ++j) { - src[j] = rnd.Rand8(); - dst[j] = rnd.Rand8(); - } - // Initialize a test block with input range [-255, 255]. - for (int j = 0; j < 16; ++j) - test_input_block[j] = src[j] - dst[j]; - - const int pitch = 4; - RunFwdTxfm(test_input_block, test_temp_block, dst, pitch, tx_type_); - - for (int j = 0; j < 16; ++j) { - if (test_temp_block[j] > 0) { - test_temp_block[j] += 2; - test_temp_block[j] /= 4; - test_temp_block[j] *= 4; - } else { - test_temp_block[j] -= 2; - test_temp_block[j] /= 4; - test_temp_block[j] *= 4; - } - } +TEST_P(Trans4x4DCT, CoeffCheck) { + RunCoeffCheck(); +} - // inverse transform and reconstruct the pixel block - RunInvTxfm(test_input_block, test_temp_block, dst, pitch, tx_type_); +TEST_P(Trans4x4DCT, MemCheck) { + RunMemCheck(); +} - for (int j = 0; j < 16; ++j) { - const int diff = dst[j] - src[j]; - const int error = diff * diff; - if (max_error < error) - max_error = error; - total_error += error; - } +TEST_P(Trans4x4DCT, InvAccuracyCheck) { + RunInvAccuracyCheck(); +} + +class Trans4x4HT + : public Trans4x4TestBase, + public PARAMS(fht_t, iht_t, int) { + public: + virtual ~Trans4x4HT() {} + + virtual void SetUp() { + fwd_txfm_ = GET_PARAM(0); + inv_txfm_ = GET_PARAM(1); + tx_type_ = GET_PARAM(2); + pitch_ = 4; + fwd_txfm_ref = fht4x4_ref; } - EXPECT_GE(1, max_error) - << "Error: FDCT/IDCT or FHT/IHT has an individual roundtrip error > 1"; + virtual void TearDown() { libvpx_test::ClearSystemState(); } - EXPECT_GE(count_test_block, total_error) - << "Error: FDCT/IDCT or FHT/IHT has average " - << "roundtrip error > 1 per block"; + protected: + void RunFwdTxfm(const int16_t *in, int16_t *out, int stride) { + fwd_txfm_(in, out, stride, tx_type_); + } + + void RunInvTxfm(const int16_t *out, uint8_t *dst, int stride) { + inv_txfm_(out, dst, stride, tx_type_); + } + + fht_t fwd_txfm_; + iht_t inv_txfm_; +}; + +TEST_P(Trans4x4HT, AccuracyCheck) { + RunAccuracyCheck(); +} + +TEST_P(Trans4x4HT, CoeffCheck) { + RunCoeffCheck(); +} + +TEST_P(Trans4x4HT, MemCheck) { + RunMemCheck(); +} + +TEST_P(Trans4x4HT, InvAccuracyCheck) { + RunInvAccuracyCheck(); } -INSTANTIATE_TEST_CASE_P(VP9, FwdTrans4x4Test, ::testing::Range(0, 4)); +using std::tr1::make_tuple; + +INSTANTIATE_TEST_CASE_P( + C, Trans4x4DCT, + ::testing::Values( + make_tuple(&vp9_fdct4x4_c, &vp9_idct4x4_16_add_c, 0))); +INSTANTIATE_TEST_CASE_P( + C, Trans4x4HT, + ::testing::Values( + make_tuple(&vp9_short_fht4x4_c, &vp9_iht4x4_16_add_c, 0), + make_tuple(&vp9_short_fht4x4_c, &vp9_iht4x4_16_add_c, 1), + make_tuple(&vp9_short_fht4x4_c, &vp9_iht4x4_16_add_c, 2), + make_tuple(&vp9_short_fht4x4_c, &vp9_iht4x4_16_add_c, 3))); + +#if HAVE_SSE2 +INSTANTIATE_TEST_CASE_P( + SSE2, Trans4x4DCT, + ::testing::Values( + make_tuple(&vp9_fdct4x4_sse2, + &vp9_idct4x4_16_add_sse2, 0))); +INSTANTIATE_TEST_CASE_P( + SSE2, Trans4x4HT, + ::testing::Values( + make_tuple(&vp9_short_fht4x4_sse2, &vp9_iht4x4_16_add_sse2, 0), + make_tuple(&vp9_short_fht4x4_sse2, &vp9_iht4x4_16_add_sse2, 1), + make_tuple(&vp9_short_fht4x4_sse2, &vp9_iht4x4_16_add_sse2, 2), + make_tuple(&vp9_short_fht4x4_sse2, &vp9_iht4x4_16_add_sse2, 3))); +#endif + } // namespace diff --git a/libvpx/test/svc_test.cc b/libvpx/test/svc_test.cc index 5941cae..98a5d94 100644 --- a/libvpx/test/svc_test.cc +++ b/libvpx/test/svc_test.cc @@ -31,12 +31,16 @@ class SvcTest : public ::testing::Test { SvcTest() : codec_iface_(0), test_file_name_("hantro_collage_w352h288.yuv"), - decoder_(0) {} + codec_initialized_(false), + decoder_(0) { + memset(&svc_, 0, sizeof(svc_)); + memset(&codec_, 0, sizeof(codec_)); + memset(&codec_enc_, 0, sizeof(codec_enc_)); + } virtual ~SvcTest() {} virtual void SetUp() { - memset(&svc_, 0, sizeof(svc_)); svc_.first_frame_full_size = 1; svc_.encoding_mode = INTER_LAYER_PREDICTION_IP; svc_.log_level = SVC_LOG_DEBUG; @@ -61,6 +65,8 @@ class SvcTest : public ::testing::Test { virtual void TearDown() { vpx_svc_release(&svc_); + delete(decoder_); + if (codec_initialized_) vpx_codec_destroy(&codec_); } SvcContext svc_; @@ -68,22 +74,16 @@ class SvcTest : public ::testing::Test { struct vpx_codec_enc_cfg codec_enc_; vpx_codec_iface_t *codec_iface_; std::string test_file_name_; - + bool codec_initialized_; Decoder *decoder_; }; TEST_F(SvcTest, SvcInit) { - svc_.spatial_layers = 0; // use default layers - vpx_codec_err_t res = vpx_svc_init(&svc_, &codec_, codec_iface_, &codec_enc_); - EXPECT_EQ(VPX_CODEC_OK, res); - EXPECT_EQ(VPX_SS_DEFAULT_LAYERS, svc_.spatial_layers); - - res = vpx_svc_init(NULL, &codec_, codec_iface_, &codec_enc_); + // test missing parameters + vpx_codec_err_t res = vpx_svc_init(NULL, &codec_, codec_iface_, &codec_enc_); EXPECT_EQ(VPX_CODEC_INVALID_PARAM, res); - res = vpx_svc_init(&svc_, NULL, codec_iface_, &codec_enc_); EXPECT_EQ(VPX_CODEC_INVALID_PARAM, res); - res = vpx_svc_init(&svc_, &codec_, NULL, &codec_enc_); EXPECT_EQ(VPX_CODEC_INVALID_PARAM, res); @@ -94,58 +94,88 @@ TEST_F(SvcTest, SvcInit) { res = vpx_svc_init(&svc_, &codec_, codec_iface_, &codec_enc_); EXPECT_EQ(VPX_CODEC_INVALID_PARAM, res); + svc_.spatial_layers = 0; // use default layers + res = vpx_svc_init(&svc_, &codec_, codec_iface_, &codec_enc_); + EXPECT_EQ(VPX_CODEC_OK, res); + codec_initialized_ = true; + EXPECT_EQ(VPX_SS_DEFAULT_LAYERS, svc_.spatial_layers); +} + +TEST_F(SvcTest, InitTwoLayers) { svc_.spatial_layers = 2; vpx_svc_set_scale_factors(&svc_, "4/16,16*16"); // invalid scale values - res = vpx_svc_init(&svc_, &codec_, codec_iface_, &codec_enc_); + vpx_codec_err_t res = vpx_svc_init(&svc_, &codec_, codec_iface_, &codec_enc_); EXPECT_EQ(VPX_CODEC_INVALID_PARAM, res); vpx_svc_set_scale_factors(&svc_, "4/16,16/16"); // valid scale values res = vpx_svc_init(&svc_, &codec_, codec_iface_, &codec_enc_); EXPECT_EQ(VPX_CODEC_OK, res); + codec_initialized_ = true; } -TEST_F(SvcTest, SetOptions) { - vpx_codec_err_t res = vpx_svc_set_options(NULL, "layers=3"); +TEST_F(SvcTest, InvalidOptions) { + vpx_codec_err_t res = vpx_svc_set_options(&svc_, NULL); EXPECT_EQ(VPX_CODEC_INVALID_PARAM, res); - vpx_svc_set_options(&svc_, NULL); + res = vpx_svc_set_options(&svc_, "not-an-option=1"); + EXPECT_EQ(VPX_CODEC_OK, res); + res = vpx_svc_init(&svc_, &codec_, vpx_codec_vp9_cx(), &codec_enc_); EXPECT_EQ(VPX_CODEC_INVALID_PARAM, res); +} - vpx_svc_set_options(&svc_, "layers=3"); +TEST_F(SvcTest, SetLayersOption) { + vpx_codec_err_t res = vpx_svc_set_options(&svc_, "layers=3"); + EXPECT_EQ(VPX_CODEC_OK, res); res = vpx_svc_init(&svc_, &codec_, vpx_codec_vp9_cx(), &codec_enc_); EXPECT_EQ(VPX_CODEC_OK, res); + codec_initialized_ = true; EXPECT_EQ(3, svc_.spatial_layers); +} - vpx_svc_set_options(&svc_, "not-an-option=1"); - res = vpx_svc_init(&svc_, &codec_, vpx_codec_vp9_cx(), &codec_enc_); - EXPECT_EQ(VPX_CODEC_INVALID_PARAM, res); - - vpx_svc_set_options(&svc_, "encoding-mode=alt-ip"); +TEST_F(SvcTest, SetEncodingMode) { + vpx_codec_err_t res = vpx_svc_set_options(&svc_, "encoding-mode=alt-ip"); + EXPECT_EQ(VPX_CODEC_OK, res); res = vpx_svc_init(&svc_, &codec_, vpx_codec_vp9_cx(), &codec_enc_); EXPECT_EQ(VPX_CODEC_OK, res); + codec_initialized_ = true; EXPECT_EQ(ALT_INTER_LAYER_PREDICTION_IP, svc_.encoding_mode); +} - vpx_svc_set_options(&svc_, "layers=2 encoding-mode=ip"); +TEST_F(SvcTest, SetMultipleOptions) { + vpx_codec_err_t res = vpx_svc_set_options(&svc_, "layers=2 encoding-mode=ip"); res = vpx_svc_init(&svc_, &codec_, vpx_codec_vp9_cx(), &codec_enc_); EXPECT_EQ(VPX_CODEC_OK, res); + codec_initialized_ = true; EXPECT_EQ(2, svc_.spatial_layers); EXPECT_EQ(INTER_LAYER_PREDICTION_IP, svc_.encoding_mode); +} - vpx_svc_set_options(&svc_, "scale-factors=not-scale-factors"); +TEST_F(SvcTest, SetScaleFactorsOption) { + svc_.spatial_layers = 2; + vpx_codec_err_t res = + vpx_svc_set_options(&svc_, "scale-factors=not-scale-factors"); + EXPECT_EQ(VPX_CODEC_OK, res); res = vpx_svc_init(&svc_, &codec_, vpx_codec_vp9_cx(), &codec_enc_); EXPECT_EQ(VPX_CODEC_INVALID_PARAM, res); - vpx_svc_set_options(&svc_, "scale-factors=1/3,2/3"); + res = vpx_svc_set_options(&svc_, "scale-factors=1/3,2/3"); + EXPECT_EQ(VPX_CODEC_OK, res); res = vpx_svc_init(&svc_, &codec_, vpx_codec_vp9_cx(), &codec_enc_); EXPECT_EQ(VPX_CODEC_OK, res); + codec_initialized_ = true; +} - vpx_svc_set_options(&svc_, "quantizers=not-quantizers"); +TEST_F(SvcTest, SetQuantizersOption) { + svc_.spatial_layers = 2; + vpx_codec_err_t res = vpx_svc_set_options(&svc_, "quantizers=not-quantizers"); + EXPECT_EQ(VPX_CODEC_OK, res); res = vpx_svc_init(&svc_, &codec_, vpx_codec_vp9_cx(), &codec_enc_); EXPECT_EQ(VPX_CODEC_INVALID_PARAM, res); vpx_svc_set_options(&svc_, "quantizers=40,45"); res = vpx_svc_init(&svc_, &codec_, vpx_codec_vp9_cx(), &codec_enc_); EXPECT_EQ(VPX_CODEC_OK, res); + codec_initialized_ = true; } TEST_F(SvcTest, SetQuantizers) { @@ -157,15 +187,16 @@ TEST_F(SvcTest, SetQuantizers) { svc_.first_frame_full_size = 0; svc_.spatial_layers = 2; - res = vpx_svc_set_quantizers(&svc_, "40,30"); + res = vpx_svc_set_quantizers(&svc_, "40"); EXPECT_EQ(VPX_CODEC_OK, res); res = vpx_svc_init(&svc_, &codec_, vpx_codec_vp9_cx(), &codec_enc_); - EXPECT_EQ(VPX_CODEC_OK, res); + EXPECT_EQ(VPX_CODEC_INVALID_PARAM, res); - res = vpx_svc_set_quantizers(&svc_, "40"); + res = vpx_svc_set_quantizers(&svc_, "40,30"); EXPECT_EQ(VPX_CODEC_OK, res); res = vpx_svc_init(&svc_, &codec_, vpx_codec_vp9_cx(), &codec_enc_); - EXPECT_EQ(VPX_CODEC_INVALID_PARAM, res); + EXPECT_EQ(VPX_CODEC_OK, res); + codec_initialized_ = true; } TEST_F(SvcTest, SetScaleFactors) { @@ -177,15 +208,16 @@ TEST_F(SvcTest, SetScaleFactors) { svc_.first_frame_full_size = 0; svc_.spatial_layers = 2; - res = vpx_svc_set_scale_factors(&svc_, "4/16,16/16"); + res = vpx_svc_set_scale_factors(&svc_, "4/16"); EXPECT_EQ(VPX_CODEC_OK, res); res = vpx_svc_init(&svc_, &codec_, vpx_codec_vp9_cx(), &codec_enc_); - EXPECT_EQ(VPX_CODEC_OK, res); + EXPECT_EQ(VPX_CODEC_INVALID_PARAM, res); - res = vpx_svc_set_scale_factors(&svc_, "4/16"); + res = vpx_svc_set_scale_factors(&svc_, "4/16,16/16"); EXPECT_EQ(VPX_CODEC_OK, res); res = vpx_svc_init(&svc_, &codec_, vpx_codec_vp9_cx(), &codec_enc_); - EXPECT_EQ(VPX_CODEC_INVALID_PARAM, res); + EXPECT_EQ(VPX_CODEC_OK, res); + codec_initialized_ = true; } // test that decoder can handle an SVC frame as the first frame in a sequence @@ -200,6 +232,7 @@ TEST_F(SvcTest, DISABLED_FirstFrameHasLayers) { vpx_codec_err_t res = vpx_svc_init(&svc_, &codec_, vpx_codec_vp9_cx(), &codec_enc_); EXPECT_EQ(VPX_CODEC_OK, res); + codec_initialized_ = true; libvpx_test::I420VideoSource video(test_file_name_, kWidth, kHeight, codec_enc_.g_timebase.den, @@ -227,6 +260,7 @@ TEST_F(SvcTest, EncodeThreeFrames) { vpx_codec_err_t res = vpx_svc_init(&svc_, &codec_, vpx_codec_vp9_cx(), &codec_enc_); ASSERT_EQ(VPX_CODEC_OK, res); + codec_initialized_ = true; libvpx_test::I420VideoSource video(test_file_name_, kWidth, kHeight, codec_enc_.g_timebase.den, @@ -280,6 +314,7 @@ TEST_F(SvcTest, GetLayerResolution) { vpx_codec_err_t res = vpx_svc_init(&svc_, &codec_, vpx_codec_vp9_cx(), &codec_enc_); EXPECT_EQ(VPX_CODEC_OK, res); + codec_initialized_ = true; // ensure that requested layer is a valid layer uint32_t layer_width, layer_height; diff --git a/libvpx/test/test-data.sha1 b/libvpx/test/test-data.sha1 index 44220d5..5229d09 100644 --- a/libvpx/test/test-data.sha1 +++ b/libvpx/test/test-data.sha1 @@ -538,3 +538,7 @@ cf8ea970c776797aae71dac8317ea926d9431cab vp90-2-08-tile_1x4_frame_parallel.webm a481fbea465010b57af5a19ebf6d4a5cfe5b9278 vp90-2-08-tile_1x4_frame_parallel.webm.md5 0203ec456277a01aec401e7fb6c72c9a7e5e3f9d vp90-2-08-tile_1x4.webm c9b237dfcc01c1b414fbcaa481d014a906ef7998 vp90-2-08-tile_1x4.webm.md5 +20c75157e91ab41f82f70ffa73d5d01df8469287 vp90-2-08-tile-4x4.webm +ae7451810247fd13975cc257aa0301ff17102255 vp90-2-08-tile-4x4.webm.md5 +2ec6e15422ac7a61af072dc5f27fcaf1942ce116 vp90-2-08-tile-4x1.webm +0094f5ee5e46345017c30e0aa4835b550212d853 vp90-2-08-tile-4x1.webm.md5 diff --git a/libvpx/test/test.mk b/libvpx/test/test.mk index f7a5d15..ac072d0 100644 --- a/libvpx/test/test.mk +++ b/libvpx/test/test.mk @@ -646,5 +646,9 @@ LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-08-tile_1x4_frame_parallel.webm LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-08-tile_1x4_frame_parallel.webm.md5 LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-08-tile_1x4.webm LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-08-tile_1x4.webm.md5 +LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-08-tile-4x4.webm +LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-08-tile-4x4.webm.md5 +LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-08-tile-4x1.webm +LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-08-tile-4x1.webm.md5 LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp91-2-04-yv444.webm LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp91-2-04-yv444.webm.md5 diff --git a/libvpx/test/test_vector_test.cc b/libvpx/test/test_vector_test.cc index c6ad1c5..08449a5 100644 --- a/libvpx/test/test_vector_test.cc +++ b/libvpx/test/test_vector_test.cc @@ -164,6 +164,7 @@ const char *kVP9TestVectors[] = { "vp90-2-07-frame_parallel.webm", "vp90-2-08-tile_1x2_frame_parallel.webm", "vp90-2-08-tile_1x2.webm", "vp90-2-08-tile_1x4_frame_parallel.webm", "vp90-2-08-tile_1x4.webm", + "vp90-2-08-tile-4x4.webm", "vp90-2-08-tile-4x1.webm", #if CONFIG_NON420 "vp91-2-04-yv444.webm" #endif diff --git a/libvpx/test/vp9_lossless_test.cc b/libvpx/test/vp9_lossless_test.cc index 441cc44..30a3118 100644 --- a/libvpx/test/vp9_lossless_test.cc +++ b/libvpx/test/vp9_lossless_test.cc @@ -35,7 +35,7 @@ class LossLessTest : public ::libvpx_test::EncoderTest, } virtual void BeginPassHook(unsigned int /*pass*/) { - psnr_ = 0.0; + psnr_ = kMaxPsnr; nframes_ = 0; } @@ -65,9 +65,9 @@ TEST_P(LossLessTest, TestLossLessEncoding) { init_flags_ = VPX_CODEC_USE_PSNR; // intentionally changed the dimension for better testing coverage - libvpx_test::I420VideoSource video("hantro_collage_w352h288.yuv", 356, 284, + libvpx_test::I420VideoSource video("hantro_collage_w352h288.yuv", 352, 288, timebase.den, timebase.num, 0, 30); - + ASSERT_NO_FATAL_FAILURE(RunLoop(&video)); const double psnr_lossless = GetMinPsnr(); EXPECT_GE(psnr_lossless, kMaxPsnr); } |