ref: 9d98e936b53dbd52902bd922f50530d4ec29ff7c
parent: bee4abc3ff606fdb7c8eb0935b780440bc6175d8
parent: 798cf80c1efd0d1608ea3cbf9e5f0b0bec56806a
author: James Zern <jzern@google.com>
date: Mon Oct 14 22:02:16 EDT 2013
Merge "add a test vector with frame parallel mode enabled"
--- a/test/test-data.sha1
+++ b/test/test-data.sha1
@@ -528,4 +528,5 @@
f6235f937552e11d8eb331ec55da6b3aa596b9ac vp90-2-06-bilinear.webm.md5
495256cfd123fe777b2c0406862ed8468a1f4677 vp91-2-04-yv444.webm
65e3a7ffef61ab340d9140f335ecc49125970c2c vp91-2-04-yv444.webm.md5
-
+0c83a1e414fde3bccd6dc451bbaee68e59974c76 vp90-2-07-frame_parallel.webm
+e5c2c9fb383e5bf3b563480adaeba5b7e3475ecd vp90-2-07-frame_parallel.webm.md5
--- a/test/test.mk
+++ b/test/test.mk
@@ -635,5 +635,7 @@
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-05-resize.ivf.md5
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-06-bilinear.webm
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-06-bilinear.webm.md5
+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-07-frame_parallel.webm
+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-07-frame_parallel.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
--- a/test/test_vector_test.cc
+++ b/test/test_vector_test.cc
@@ -161,6 +161,7 @@
"vp90-2-03-size-226x210.webm", "vp90-2-03-size-226x224.webm",
"vp90-2-03-size-226x226.webm", "vp90-2-03-deltaq.webm",
"vp90-2-05-resize.ivf", "vp90-2-06-bilinear.webm",
+ "vp90-2-07-frame_parallel.webm",
#if CONFIG_NON420
"vp91-2-04-yv444.webm"
#endif