ref: 4b8b1bae527cff7d6c15981330c6ae735a14cca2
parent: f53d3363ac41b9997e07f5d8faac1f734c8ddc9c
parent: c327b3f0b04f9d99756d0ef208b2d9e025958e64
author: Yunqing Wang <yunqingwang@google.com>
date: Tue Oct 25 16:54:25 EDT 2016
Merge "Modify the encoder multi-thread unit test"
--- a/test/vp9_ethread_test.cc
+++ b/test/vp9_ethread_test.cc
@@ -65,6 +65,7 @@
encoder->Control(VP8E_SET_ARNR_MAXFRAMES, 7);
encoder->Control(VP8E_SET_ARNR_STRENGTH, 5);
encoder->Control(VP8E_SET_ARNR_TYPE, 3);
+ encoder->Control(VP9E_SET_FRAME_PARALLEL_DECODING, 0);
} else {
encoder->Control(VP8E_SET_ENABLEAUTOALTREF, 0);
encoder->Control(VP9E_SET_AQ_MODE, 3);
@@ -127,7 +128,7 @@
::testing::Values(::libvpx_test::kTwoPassGood,
::libvpx_test::kOnePassGood,
::libvpx_test::kRealTime),
- ::testing::Range(1, 9), // cpu_used
+ ::testing::Range(0, 9), // cpu_used
::testing::Range(0, 3), // tile_columns
::testing::Range(2, 5)); // threads
} // namespace