Merge "Add initialization and per frame flag members"

This commit is contained in:
Adrian Grange
2012-10-04 10:37:38 -07:00
committed by Gerrit Code Review
3 changed files with 19 additions and 14 deletions

View File

@@ -34,7 +34,7 @@ class KeyframeTest : public ::libvpx_test::EncoderTest,
virtual void PreEncodeFrameHook(::libvpx_test::VideoSource *video,
::libvpx_test::Encoder *encoder) {
if (kf_do_force_kf_)
flags_ = (video->frame() % 3) ? 0 : VPX_EFLAG_FORCE_KF;
frame_flags_ = (video->frame() % 3) ? 0 : VPX_EFLAG_FORCE_KF;
if (set_cpu_used_ && video->frame() == 1)
encoder->Control(VP8E_SET_CPUUSED, set_cpu_used_);
}