shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Added three test vectors with droppable frames"

--- a/test/test-data.sha1

+++ b/test/test-data.sha1

@@ -582,3 +582,9 @@

 19e003804ec1dfc5464813b32339a15d5ba7b42f  vp90-2-11-size-351x288.webm.md5

 40cd1d6a188d7a88b21ebac1e573d3f270ab261e  vp90-2-11-size-352x287.webm

 68f515abe3858fc1eded46c8e6b2f727d43b5331  vp90-2-11-size-352x287.webm.md5

+9a510769ff23db410880ec3029d433e87d17f7fc  vp90-2-12-droppable_1.ivf

+952eaac6eefa6f62179ed1db3e922fd42fecc624  vp90-2-12-droppable_1.ivf.md5

+9a510769ff23db410880ec3029d433e87d17f7fc  vp90-2-12-droppable_2.ivf

+92a756469fa438220524e7fa6ac1d38c89514d17  vp90-2-12-droppable_2.ivf.md5

+c21e97e4ba486520118d78b01a5cb6e6dc33e190  vp90-2-12-droppable_3.ivf

+601abc9e4176c70f82ac0381365e9b151fdd24cd  vp90-2-12-droppable_3.ivf.md5

--- a/test/test.mk

+++ b/test/test.mk

@@ -685,6 +685,12 @@

 LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-11-size-351x288.webm.md5

 LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-11-size-352x287.webm

 LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-11-size-352x287.webm.md5

+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-12-droppable_1.ivf

+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-12-droppable_1.ivf.md5

+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-12-droppable_2.ivf

+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-12-droppable_2.ivf.md5

+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-12-droppable_3.ivf

+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-12-droppable_3.ivf.md5

 ifeq ($(CONFIG_DECODE_PERF_TESTS),yes)

 # BBB VP9 streams

--- a/test/test_vectors.cc

+++ b/test/test_vectors.cc

@@ -159,7 +159,8 @@

   "vp90-2-02-size-lf-1920x1080.webm", "vp90-2-09-aq2.webm",

   "vp90-2-09-lf_deltas.webm", "vp90-2-10-show-existing-frame.webm",

   "vp90-2-11-size-351x287.webm", "vp90-2-11-size-351x288.webm",

-  "vp90-2-11-size-352x287.webm",

+  "vp90-2-11-size-352x287.webm", "vp90-2-12-droppable_1.ivf",

+  "vp90-2-12-droppable_2.ivf", "vp90-2-12-droppable_3.ivf",

 #if CONFIG_NON420

   "vp91-2-04-yv444.webm"

 #endif

--- a/test/test_vectors.h

+++ b/test/test_vectors.h

@@ -22,9 +22,9 @@

 #if CONFIG_VP9_DECODER

 #if CONFIG_NON420

-const int kNumVp9TestVectors = 220;

+const int kNumVp9TestVectors = 223;

 #else

-const int kNumVp9TestVectors = 219;

+const int kNumVp9TestVectors = 222;

 #endif

 extern const char *kVP9TestVectors[kNumVp9TestVectors];