ref: 587a0b3ef9b191d294d2447a7a918d43bd082db4
parent: 71d5a59c6db964cee203349b8bfad3a15aa719b2
author: Alex Converse <aconverse@google.com>
date: Thu Mar 5 06:47:21 EST 2015
Call encoder control before running ethread test. The first value of video->frame() is 15 because of the source range used. Change-Id: I219c287b500fa376160d6dcfb937092e577ec959
--- a/test/vp9_ethread_test.cc
+++ b/test/vp9_ethread_test.cc
@@ -24,6 +24,7 @@
protected:
VP9EncoderThreadTest()
: EncoderTest(GET_PARAM(0)),
+ encoder_initialized_(false),
tiles_(2),
encoding_mode_(GET_PARAM(1)),
set_cpu_used_(GET_PARAM(2)) {
@@ -57,9 +58,13 @@
cfg_.rc_min_quantizer = 0;
}
+ virtual void BeginPassHook(unsigned int /*pass*/) {
+ encoder_initialized_ = false;
+ }
+
virtual void PreEncodeFrameHook(::libvpx_test::VideoSource *video,
::libvpx_test::Encoder *encoder) {
- if (video->frame() == 0) {
+ if (!encoder_initialized_) {
// Encode 4 column tiles.
encoder->Control(VP9E_SET_TILE_COLUMNS, tiles_);
encoder->Control(VP8E_SET_CPUUSED, set_cpu_used_);
@@ -71,6 +76,7 @@
} else {
encoder->Control(VP8E_SET_ENABLEAUTOALTREF, 0);
}
+ encoder_initialized_ = true;
}
}
@@ -90,6 +96,7 @@
}
}
+ bool encoder_initialized_;
int tiles_;
::libvpx_test::TestMode encoding_mode_;
int set_cpu_used_;
--
⑨