ref: 321c2fd178b62f1369d866c074ccc54f0b6e2eb2
parent: cb24406da5367fbbbe00331d78f6ae30502c2193
parent: 93ffd371eba7653fc96c6e1ba85afbabd84aad02
author: Adrian Grange <[email protected]>
date: Tue Sep 10 08:46:38 EDT 2013
Merge "Enable and fix resize_test for VP9"
--- a/test/resize_test.cc
+++ b/test/resize_test.cc
@@ -124,6 +124,13 @@
::libvpx_test::I420VideoSource video("hantro_collage_w352h288.yuv", 352, 288,30, 1, 0, 10);
init_flags_ = VPX_CODEC_USE_PSNR;
+
+ // If the number of frames being encoded is smaller than g_lag_in_frames
+ // the encoded frame is unavailable using the current API. Comparing
+ // frames to detect mismatch would then not be possible. Set
+ // g_lag_in_frames = 0 to get around this.
+ cfg_.g_lag_in_frames = 0;
+
// q picked such that initial keyframe on this clip is ~30dB PSNR
cfg_.rc_min_quantizer = cfg_.rc_max_quantizer = 48;
ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
--- a/test/test.mk
+++ b/test/test.mk
@@ -24,7 +24,7 @@
LIBVPX_TEST_SRCS-$(CONFIG_ENCODERS) += i420_video_source.h
LIBVPX_TEST_SRCS-$(CONFIG_VP8_ENCODER) += keyframe_test.cc
LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += borders_test.cc
-LIBVPX_TEST_SRCS-$(CONFIG_VP8_ENCODER) += resize_test.cc
+LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += resize_test.cc
LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += cpu_speed_test.cc
LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += vp9_lossless_test.cc