summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaowu Xu <yaowu@google.com>2014-05-09 15:56:45 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-05-09 15:56:45 -0700
commit242c36b646aa2b825642c1472cd2d37c42f3a92b (patch)
tree8e3e94ff8372575c50afd423a1a36aaa8596ffbe
parentd4dcf7293fd8bd14660aecd14535fe7f4770bf9c (diff)
parentf641d6bc7a1368af50651230a0122aed7e28bab1 (diff)
downloadlibvpx-242c36b646aa2b825642c1472cd2d37c42f3a92b.tar
libvpx-242c36b646aa2b825642c1472cd2d37c42f3a92b.tar.gz
libvpx-242c36b646aa2b825642c1472cd2d37c42f3a92b.tar.bz2
libvpx-242c36b646aa2b825642c1472cd2d37c42f3a92b.zip
Merge "Added a test vector"
-rw-r--r--test/test-data.sha12
-rw-r--r--test/test.mk2
-rw-r--r--test/test_vectors.cc3
3 files changed, 6 insertions, 1 deletions
diff --git a/test/test-data.sha1 b/test/test-data.sha1
index cf2ad1eba..77ad775ae 100644
--- a/test/test-data.sha1
+++ b/test/test-data.sha1
@@ -635,3 +635,5 @@ be0fe64a1a4933696ff92d93f9bdecdbd886dc13 vp90-2-14-resize-fp-tiles-16-8.webm.md
1765315acccfe6cd12230e731369fcb15325ebfa vp90-2-14-resize-fp-tiles-1-2-4-8-16.webm.md5
4a2b7a683576fe8e330c7d1c4f098ff4e70a43a8 vp90-2-14-resize-fp-tiles-16-8-4-2-1.webm
1ef480392112b3509cb190afbb96f9a38dd9fbac vp90-2-14-resize-fp-tiles-16-8-4-2-1.webm.md5
+e615575ded499ea1d992f3b38e3baa434509cdcd vp90-2-15-segkey.webm
+e3ab35d4316c5e81325c50f5236ceca4bc0d35df vp90-2-15-segkey.webm.md5 \ No newline at end of file
diff --git a/test/test.mk b/test/test.mk
index 0dcb6c86e..45a2fd633 100644
--- a/test/test.mk
+++ b/test/test.mk
@@ -748,6 +748,8 @@ LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-14-resize-fp-tiles-1-2-4-8-16.w
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-14-resize-fp-tiles-1-2-4-8-16.webm.md5
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-14-resize-fp-tiles-16-8-4-2-1.webm
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-14-resize-fp-tiles-16-8-4-2-1.webm.md5
+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-15-segkey.webm
+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-15-segkey.webm.md5
ifeq ($(CONFIG_DECODE_PERF_TESTS),yes)
# BBB VP9 streams
diff --git a/test/test_vectors.cc b/test/test_vectors.cc
index ff3c389e5..08498ebf0 100644
--- a/test/test_vectors.cc
+++ b/test/test_vectors.cc
@@ -177,7 +177,8 @@ const char *const kVP9TestVectors[] = {
"vp90-2-14-resize-fp-tiles-4-16.webm", "vp90-2-14-resize-fp-tiles-4-1.webm",
"vp90-2-14-resize-fp-tiles-4-2.webm", "vp90-2-14-resize-fp-tiles-4-8.webm",
"vp90-2-14-resize-fp-tiles-8-16.webm", "vp90-2-14-resize-fp-tiles-8-1.webm",
- "vp90-2-14-resize-fp-tiles-8-2.webm", "vp90-2-14-resize-fp-tiles-8-4.webm"
+ "vp90-2-14-resize-fp-tiles-8-2.webm", "vp90-2-14-resize-fp-tiles-8-4.webm",
+ "vp90-2-15-segkey.webm"
};
const int kNumVP9TestVectors = NELEMENTS(kVP9TestVectors);
#endif // CONFIG_VP9_DECODER