diff options
author | Alex Converse <aconverse@google.com> | 2015-01-21 13:59:34 -0800 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-01-21 13:59:34 -0800 |
commit | aaa31a3164b912a86149627ca98e98fdfce6f441 (patch) | |
tree | 9eb4879a75259316e4019fd5ad45c5838b5db475 /test | |
parent | 13458362af8089df06d1534de928acfc93ac7cc5 (diff) | |
parent | 910ca857df5df679839c3ccdf4e5ca97159b1fd2 (diff) | |
download | libvpx-aaa31a3164b912a86149627ca98e98fdfce6f441.tar libvpx-aaa31a3164b912a86149627ca98e98fdfce6f441.tar.gz libvpx-aaa31a3164b912a86149627ca98e98fdfce6f441.tar.bz2 libvpx-aaa31a3164b912a86149627ca98e98fdfce6f441.zip |
Merge "Allow external resize via vpx_codec_enc_config_set"
Diffstat (limited to 'test')
-rw-r--r-- | test/resize_test.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/resize_test.cc b/test/resize_test.cc index 9d0c570ae..5c25dc11c 100644 --- a/test/resize_test.cc +++ b/test/resize_test.cc @@ -144,6 +144,7 @@ class ResizeTest : public ::libvpx_test::EncoderTest, TEST_P(ResizeTest, TestExternalResizeWorks) { ResizingVideoSource video; + cfg_.g_lag_in_frames = 0; ASSERT_NO_FATAL_FAILURE(RunLoop(&video)); for (std::vector<FrameInfo>::const_iterator info = frame_info_list_.begin(); @@ -153,9 +154,9 @@ TEST_P(ResizeTest, TestExternalResizeWorks) { const unsigned int expected_h = ScaleForFrameNumber(frame, kInitialHeight); EXPECT_EQ(expected_w, info->w) - << "Frame " << frame << "had unexpected width"; + << "Frame " << frame << " had unexpected width"; EXPECT_EQ(expected_h, info->h) - << "Frame " << frame << "had unexpected height"; + << "Frame " << frame << " had unexpected height"; } } @@ -261,6 +262,8 @@ TEST_P(ResizeInternalTest, TestInternalResizeWorks) { } VP8_INSTANTIATE_TEST_CASE(ResizeTest, ONE_PASS_TEST_MODES); +VP9_INSTANTIATE_TEST_CASE(ResizeTest, + ::testing::Values(::libvpx_test::kRealTime)); VP9_INSTANTIATE_TEST_CASE(ResizeInternalTest, ::testing::Values(::libvpx_test::kOnePassBest)); } // namespace |