summaryrefslogtreecommitdiff
path: root/test/vp9_end_to_end_test.cc
diff options
context:
space:
mode:
authorJim Bankoski <jimbankoski@google.com>2014-12-07 11:28:51 -0800
committerJim Bankoski <jimbankoski@google.com>2014-12-07 11:28:51 -0800
commitbe7a2858201ab7585d1e4f5528b98c95a147b075 (patch)
tree97f93538e3b0aeba17e20c4b5b91bd57b617070a /test/vp9_end_to_end_test.cc
parentda464c483f99ad1c97e4fd4a79579ab4b802ed6b (diff)
downloadlibvpx-be7a2858201ab7585d1e4f5528b98c95a147b075.tar
libvpx-be7a2858201ab7585d1e4f5528b98c95a147b075.tar.gz
libvpx-be7a2858201ab7585d1e4f5528b98c95a147b075.tar.bz2
libvpx-be7a2858201ab7585d1e4f5528b98c95a147b075.zip
Make the decoder Cfg available to encoder tests..
Adds decoder config as a changeable parameter to unit tests, and changes end to end test to use commonly used parameters to enable base test of tiles encoding and frame parallel decoding. Change-Id: I5d23a6857303b4d68b92b15c3f2f04a1bcb4c2bb
Diffstat (limited to 'test/vp9_end_to_end_test.cc')
-rw-r--r--test/vp9_end_to_end_test.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/test/vp9_end_to_end_test.cc b/test/vp9_end_to_end_test.cc
index a8f679342..b98deceba 100644
--- a/test/vp9_end_to_end_test.cc
+++ b/test/vp9_end_to_end_test.cc
@@ -82,6 +82,7 @@ class EndToEndTestLarge
cfg_.g_lag_in_frames = 0;
cfg_.rc_end_usage = VPX_CBR;
}
+ dec_cfg_.threads = 4;
test_video_param_ = GET_PARAM(2);
}
@@ -98,6 +99,8 @@ class EndToEndTestLarge
virtual void PreEncodeFrameHook(::libvpx_test::VideoSource *video,
::libvpx_test::Encoder *encoder) {
if (video->frame() == 1) {
+ encoder->Control(VP9E_SET_FRAME_PARALLEL_DECODING, 1);
+ encoder->Control(VP9E_SET_TILE_COLUMNS, 4);
encoder->Control(VP8E_SET_CPUUSED, kCpuUsed);
if (encoding_mode_ != ::libvpx_test::kRealTime) {
encoder->Control(VP8E_SET_ENABLEAUTOALTREF, 1);