summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaowu Xu <yaowu@google.com>2014-09-03 17:17:12 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-09-03 17:17:12 -0700
commitc9448ade2b8af6ae1bf75a90ab61e22e01ccbef0 (patch)
tree36f05a61007437f0beb62769955270e6efc43b4c
parent7ab5de04fd243918089afa2ed56a9cc94c029477 (diff)
parent81e5d3f9882e404df03681f3cab0fb9d092d0dc0 (diff)
downloadlibvpx-c9448ade2b8af6ae1bf75a90ab61e22e01ccbef0.tar
libvpx-c9448ade2b8af6ae1bf75a90ab61e22e01ccbef0.tar.gz
libvpx-c9448ade2b8af6ae1bf75a90ab61e22e01ccbef0.tar.bz2
libvpx-c9448ade2b8af6ae1bf75a90ab61e22e01ccbef0.zip
Merge "Add a more complex SEG_LVL_SKIP test vector."
-rw-r--r--test/test-data.sha12
-rw-r--r--test/test.mk2
-rw-r--r--test/test_vectors.cc2
3 files changed, 5 insertions, 1 deletions
diff --git a/test/test-data.sha1 b/test/test-data.sha1
index 7b19590cb..61667492e 100644
--- a/test/test-data.sha1
+++ b/test/test-data.sha1
@@ -689,3 +689,5 @@ fac89b5735be8a86b0dc05159f996a5c3208ae32 invalid-vp90-2-09-aq2.webm.ivf.s3984_r
d3ea592c8d7b05d14c7ed48befc0a3aaf7709b7a invalid-vp90-2-09-subpixel-00.ivf.s19552_r01-05_b6-.ivf.res
65e93f9653bcf65b022f7d225268d1a90a76e7bb vp90-2-19-skip.webm
368dccdde5288c13c25695d2eacdc7402cadf613 vp90-2-19-skip.webm.md5
+ffe460282df2b0e7d4603c2158653ad96f574b02 vp90-2-19-skip-01.webm
+bd21bc9eda4a4a36b221d71ede3a139fc3c7bd85 vp90-2-19-skip-01.webm.md5
diff --git a/test/test.mk b/test/test.mk
index a02f1a0d2..7c341698f 100644
--- a/test/test.mk
+++ b/test/test.mk
@@ -787,6 +787,8 @@ LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-18-resize.ivf
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-18-resize.ivf.md5
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-19-skip.webm
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-19-skip.webm.md5
+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-19-skip-01.webm
+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-19-skip-01.webm.md5
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp91-2-04-yuv444.webm
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp91-2-04-yuv444.webm.md5
diff --git a/test/test_vectors.cc b/test/test_vectors.cc
index b83aecb77..cccebf8f1 100644
--- a/test/test_vectors.cc
+++ b/test/test_vectors.cc
@@ -182,7 +182,7 @@ const char *const kVP9TestVectors[] = {
"vp90-2-15-segkey.webm", "vp90-2-15-segkey_adpq.webm",
"vp90-2-16-intra-only.webm", "vp90-2-17-show-existing-frame.webm",
"vp90-2-18-resize.ivf", "vp90-2-19-skip.webm",
- "vp91-2-04-yuv444.webm",
+ "vp90-2-19-skip-01.webm", "vp91-2-04-yuv444.webm",
};
const int kNumVP9TestVectors = NELEMENTS(kVP9TestVectors);
#endif // CONFIG_VP9_DECODER