diff options
author | Yaowu Xu <yaowu@google.com> | 2014-03-06 17:48:38 -0800 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-03-06 17:48:38 -0800 |
commit | 21ba1c9f9531842e4ffcab15f6c0078f3177e096 (patch) | |
tree | 2ccc76f9eca746505bec88a7639bfa741348e475 /test | |
parent | a7407efbbdad8a7e947ac9031e8fdf9de7343eb4 (diff) | |
parent | 9e889d5da5b1f39ee79dbd4ce748141f9e9ce933 (diff) | |
download | libvpx-21ba1c9f9531842e4ffcab15f6c0078f3177e096.tar libvpx-21ba1c9f9531842e4ffcab15f6c0078f3177e096.tar.gz libvpx-21ba1c9f9531842e4ffcab15f6c0078f3177e096.tar.bz2 libvpx-21ba1c9f9531842e4ffcab15f6c0078f3177e096.zip |
Merge "cpu_speed_test - now test one pass and more speeds"
Diffstat (limited to 'test')
-rw-r--r-- | test/cpu_speed_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/cpu_speed_test.cc b/test/cpu_speed_test.cc index c92e72379..569ff2605 100644 --- a/test/cpu_speed_test.cc +++ b/test/cpu_speed_test.cc @@ -79,7 +79,7 @@ TEST_P(CpuSpeedTest, TestEncodeHighBitrate) { cfg_.rc_min_quantizer = 0; ::libvpx_test::I420VideoSource video("hantro_odd.yuv", 208, 144, 30, 1, 0, - 40); + 20); ASSERT_NO_FATAL_FAILURE(RunLoop(&video)); } @@ -95,7 +95,7 @@ TEST_P(CpuSpeedTest, TestLowBitrate) { cfg_.rc_min_quantizer = 40; ::libvpx_test::I420VideoSource video("hantro_odd.yuv", 208, 144, 30, 1, 0, - 40); + 20); ASSERT_NO_FATAL_FAILURE(RunLoop(&video)); } @@ -107,6 +107,6 @@ using std::tr1::make_tuple; VP9_INSTANTIATE_TEST_CASE( CpuSpeedTest, - ::testing::Values(::libvpx_test::kTwoPassGood), - ::testing::Range(0, 5)); + ::testing::Values(::libvpx_test::kTwoPassGood, ::libvpx_test::kOnePassGood), + ::testing::Range(0, 8)); } // namespace |