diff options
| author | Adrian Grange <agrange@google.com> | 2013-09-10 12:02:37 -0700 |
|---|---|---|
| committer | Adrian Grange <agrange@google.com> | 2013-09-10 12:02:37 -0700 |
| commit | 93ffd371eba7653fc96c6e1ba85afbabd84aad02 (patch) | |
| tree | ed679e3530fd0592fd491b931cb77fe2a1748236 | |
| parent | 3d22d3ae0c77dbb529040aa7674a3799e201ba81 (diff) | |
| download | libvpx-93ffd371eba7653fc96c6e1ba85afbabd84aad02.tar.gz | |
Enable and fix resize_test for VP9
Added the resize_test unit test to the VP9 set.
Set g_in_frames = 0 to avoid a problem when the total
number of frames being encoded is smaller than
g_in_frames. In this case the test will not have
access to the encoded frames and will not be able to
compare them for testing for encoder/decoder mismatch.
Change-Id: I0d2ff8ef058de7002c5faa894ed6ea794d5f900b
| -rw-r--r-- | test/resize_test.cc | 7 | ||||
| -rw-r--r-- | test/test.mk | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/test/resize_test.cc b/test/resize_test.cc index 7412a2417..77d3f5cf2 100644 --- a/test/resize_test.cc +++ b/test/resize_test.cc @@ -124,6 +124,13 @@ TEST_P(ResizeInternalTest, TestInternalResizeWorks) { ::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)); diff --git a/test/test.mk b/test/test.mk index 4eb599dd8..a64c0b877 100644 --- a/test/test.mk +++ b/test/test.mk @@ -24,7 +24,7 @@ LIBVPX_TEST_SRCS-$(CONFIG_ENCODERS) += error_resilience_test.cc 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 |