diff options
| author | James Zern <jzern@google.com> | 2015-02-25 19:09:59 -0800 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2015-02-25 19:12:03 -0800 |
| commit | 7839d0382ad8f1fbaff6d8f79cf5b18eed49c718 (patch) | |
| tree | a89ab31c18b626ccbd8dfd769b6857ac865c29b6 | |
| parent | 3e1d14a6ce812dece1f50800c2a29431b25822b7 (diff) | |
| download | libvpx-7839d0382ad8f1fbaff6d8f79cf5b18eed49c718.tar libvpx-7839d0382ad8f1fbaff6d8f79cf5b18eed49c718.tar.gz libvpx-7839d0382ad8f1fbaff6d8f79cf5b18eed49c718.tar.bz2 libvpx-7839d0382ad8f1fbaff6d8f79cf5b18eed49c718.zip | |
tests: add a shorter 720p test clip
niklas_1280_720_30.y4m 60 frames @ 30fps
only a small number of frames are being used; this reduces the test data
download size in non-perf-test cases by >500M.
retain niklas_1280_720_30.yuv for encode+decode perf tests
Change-Id: I56b3433104acd462f952a9554280de5a3ec0b6d2
| -rw-r--r-- | test/test-data.mk | 2 | ||||
| -rw-r--r-- | test/test-data.sha1 | 1 | ||||
| -rw-r--r-- | test/vp9_encoder_parms_get_to_decoder.cc | 2 | ||||
| -rw-r--r-- | test/vp9_ethread_test.cc | 7 |
4 files changed, 6 insertions, 6 deletions
diff --git a/test/test-data.mk b/test/test-data.mk index 5889ed909..d25c3576a 100644 --- a/test/test-data.mk +++ b/test/test-data.mk @@ -17,7 +17,7 @@ LIBVPX_TEST_DATA-$(CONFIG_ENCODERS) += park_joy_90p_8_422.y4m LIBVPX_TEST_DATA-$(CONFIG_ENCODERS) += park_joy_90p_8_444.y4m LIBVPX_TEST_DATA-$(CONFIG_ENCODERS) += park_joy_90p_8_440.yuv -LIBVPX_TEST_DATA-$(CONFIG_VP9_ENCODER) += niklas_1280_720_30.yuv +LIBVPX_TEST_DATA-$(CONFIG_VP9_ENCODER) += niklas_1280_720_30.y4m LIBVPX_TEST_DATA-$(CONFIG_VP9_ENCODER) += rush_hour_444.y4m LIBVPX_TEST_DATA-$(CONFIG_VP9_ENCODER) += screendata.y4m diff --git a/test/test-data.sha1 b/test/test-data.sha1 index cc5fe23b9..12129416b 100644 --- a/test/test-data.sha1 +++ b/test/test-data.sha1 @@ -741,3 +741,4 @@ d18c90709a0d03c82beadf10898b27d88fff719c invalid-vp90-2-03-size-224x196.webm.iv d06285d109ecbaef63b0cbcc44d70a129186f51c invalid-vp90-2-03-size-224x196.webm.ivf.s44156_r01-05_b6-.ivf.res e60d859b0ef2b331b21740cf6cb83fabe469b079 invalid-vp90-2-03-size-202x210.webm.ivf.s113306_r01-05_b6-.ivf 0ae808dca4d3c1152a9576e14830b6faa39f1b4a invalid-vp90-2-03-size-202x210.webm.ivf.s113306_r01-05_b6-.ivf.res +9cfc855459e7549fd015c79e8eca512b2f2cb7e3 niklas_1280_720_30.y4m diff --git a/test/vp9_encoder_parms_get_to_decoder.cc b/test/vp9_encoder_parms_get_to_decoder.cc index cdc308d67..c477af9e5 100644 --- a/test/vp9_encoder_parms_get_to_decoder.cc +++ b/test/vp9_encoder_parms_get_to_decoder.cc @@ -56,7 +56,7 @@ struct EncodePerfTestVideo { }; const EncodePerfTestVideo kVP9EncodePerfTestVectors[] = { - {"niklas_1280_720_30.yuv", 1280, 720, 600, 10}, + {"niklas_1280_720_30.y4m", 1280, 720, 600, 10}, }; struct EncodeParameters { diff --git a/test/vp9_ethread_test.cc b/test/vp9_ethread_test.cc index d309483c6..ea1e0d79f 100644 --- a/test/vp9_ethread_test.cc +++ b/test/vp9_ethread_test.cc @@ -13,9 +13,9 @@ #include "third_party/googletest/src/include/gtest/gtest.h" #include "test/codec_factory.h" #include "test/encode_test_driver.h" -#include "test/i420_video_source.h" -#include "test/util.h" #include "test/md5_helper.h" +#include "test/util.h" +#include "test/y4m_video_source.h" namespace { class VP9EncoderThreadTest @@ -100,8 +100,7 @@ class VP9EncoderThreadTest TEST_P(VP9EncoderThreadTest, EncoderResultTest) { std::vector<std::string> single_thr_md5, multi_thr_md5; - ::libvpx_test::I420VideoSource video("niklas_1280_720_30.yuv", 1280, 720, - 50, 1, 15, 20); + ::libvpx_test::Y4mVideoSource video("niklas_1280_720_30.y4m", 15, 20); cfg_.rc_target_bitrate = 1000; |