Add two test vectors with multiple AV1 sequences
This commit adds two test vectors with two AV1 sequences in each. The
two sequences in each vector have different resolutions to verify
that decoder can handle at least resolution change correctly.
BUG=aomedia:2109
Change-Id: Ia90a4123336d50d297f6fa43081712e719a49ee6
diff --git a/test/test-data.sha1 b/test/test-data.sha1
index 40c5b9e..9ad8c9c 100644
--- a/test/test-data.sha1
+++ b/test/test-data.sha1
@@ -493,3 +493,7 @@
63ea689d025593e5d91760785b8e446d04d4671e *av1-1-b10-00-quantizer-63.ivf.md5
a9f7ea6312a533cc6426a6145edd190d45813c37 *av1-1-b8-02-allintra.ivf
8fd8f789cfee1069d20f3e2c241f5cad7292239e *av1-1-b8-02-allintra.ivf.md5
+e69e41fee40b408b6eebcc79f266a95f2ee24f9e *av1-1-b8-03-sizedown.mkv
+8c528fb3ccda959a29721566e132f730935ca32b *av1-1-b8-03-sizedown.mkv.md5
+1889da5ee1708007e47bb887470ac477e1d7ba01 *av1-1-b8-03-sizeup.mkv
+8de81b170635d456602dc8923a8b39c534d01fa8 *av1-1-b8-03-sizeup.mkv.md5
\ No newline at end of file
diff --git a/test/test_data_util.cmake b/test/test_data_util.cmake
index acb7a17..5f1107a 100644
--- a/test/test_data_util.cmake
+++ b/test/test_data_util.cmake
@@ -500,7 +500,11 @@
"av1-1-b8-01-size-66x66.ivf"
"av1-1-b8-01-size-66x66.ivf.md5"
"av1-1-b8-02-allintra.ivf"
- "av1-1-b8-02-allintra.ivf.md5")
+ "av1-1-b8-02-allintra.ivf.md5"
+ "av1-1-b8-03-sizeup.mkv"
+ "av1-1-b8-03-sizeup.mkv.md5"
+ "av1-1-b8-03-sizedown.mkv"
+ "av1-1-b8-03-sizedown.mkv.md5")
endif()
if(ENABLE_ENCODE_PERF_TESTS AND CONFIG_AV1_ENCODER)
diff --git a/test/test_vector_test.cc b/test/test_vector_test.cc
index 1bfeacb..286988b 100644
--- a/test/test_vector_test.cc
+++ b/test/test_vector_test.cc
@@ -119,7 +119,8 @@
testing::internal::scoped_ptr<libaom_test::CompressedVideoSource> video;
if (filename.substr(filename.length() - 3, 3) == "ivf") {
video.reset(new libaom_test::IVFVideoSource(filename));
- } else if (filename.substr(filename.length() - 4, 4) == "webm") {
+ } else if (filename.substr(filename.length() - 4, 4) == "webm" ||
+ filename.substr(filename.length() - 3, 3) == "mkv") {
#if CONFIG_WEBM_IO
video.reset(new libaom_test::WebMVideoSource(filename));
#else
diff --git a/test/test_vectors.cc b/test/test_vectors.cc
index f478c01..71e431e 100644
--- a/test/test_vectors.cc
+++ b/test/test_vectors.cc
@@ -131,7 +131,8 @@
"av1-1-b8-01-size-66x16.ivf", "av1-1-b8-01-size-66x18.ivf",
"av1-1-b8-01-size-66x32.ivf", "av1-1-b8-01-size-66x34.ivf",
"av1-1-b8-01-size-66x64.ivf", "av1-1-b8-01-size-66x66.ivf",
- "av1-1-b8-02-allintra.ivf",
+ "av1-1-b8-02-allintra.ivf", "av1-1-b8-03-sizedown.mkv",
+ "av1-1-b8-03-sizeup.mkv"
};
const int kNumAV1TestVectors = NELEMENTS(kAV1TestVectors);
#endif // CONFIG_AV1_DECODER
