L2E: Add target level in GOP unit tests

Change-Id: Icecc3031e1052bb5a94f6c5957ec5190aae990ba

diff --git a/test/vp9_ext_ratectrl_test.cc b/test/vp9_ext_ratectrl_test.cc
index c954495dff3dacae6c2fc2cc85a6d658fd6f8bc6..6687f7fec5bdb076d9ba8bcdf286dae66492c54c 100644 (file)
--- a/test/vp9_ext_ratectrl_test.cc
+++ b/test/vp9_ext_ratectrl_test.cc
@@ -497,7 +497,7 @@ vpx_rc_status_t rc_get_gop_decision_short(vpx_rc_model_t rate_ctrl_model,
   ToyRateCtrl *toy_rate_ctrl = static_cast<ToyRateCtrl *>(rate_ctrl_model);
   EXPECT_EQ(toy_rate_ctrl->magic_number, kModelMagicNumber);
   EXPECT_EQ(gop_info->lag_in_frames, kMaxLagInFrames - 1);
-  EXPECT_EQ(gop_info->min_gf_interval, kDefaultMinGfInterval);
+  EXPECT_EQ(gop_info->min_gf_interval, kDefaultMinGfInterval + 1);
   EXPECT_EQ(gop_info->max_gf_interval, kDefaultMaxGfInterval);
   EXPECT_EQ(gop_info->allow_alt_ref, 1);
   if (gop_info->is_key_frame) {
@@ -571,7 +571,7 @@ vpx_rc_status_t rc_get_gop_decision_short_no_arf(
   ToyRateCtrl *toy_rate_ctrl = static_cast<ToyRateCtrl *>(rate_ctrl_model);
   EXPECT_EQ(toy_rate_ctrl->magic_number, kModelMagicNumber);
   EXPECT_EQ(gop_info->lag_in_frames, kMaxLagInFrames - 1);
-  EXPECT_EQ(gop_info->min_gf_interval, kDefaultMinGfInterval);
+  EXPECT_EQ(gop_info->min_gf_interval, kDefaultMinGfInterval + 1);
   EXPECT_EQ(gop_info->max_gf_interval, kDefaultMaxGfInterval);
   EXPECT_EQ(gop_info->allow_alt_ref, 1);
   if (gop_info->is_key_frame) {
@@ -752,6 +752,7 @@ class ExtRateCtrlTestGOPShort : public ::libvpx_test::EncoderTest,
     if (video->frame() == 0) {
       encoder->Control(VP9E_SET_MIN_GF_INTERVAL, kDefaultMinGfInterval);
       encoder->Control(VP9E_SET_MAX_GF_INTERVAL, kDefaultMaxGfInterval);
+      encoder->Control(VP9E_SET_TARGET_LEVEL, vp9::LEVEL_AUTO);
 
       vpx_rc_funcs_t rc_funcs;
       rc_funcs.rc_type = VPX_RC_GOP_QP;
@@ -799,6 +800,7 @@ class ExtRateCtrlTestGOPShortOverlay
     if (video->frame() == 0) {
       encoder->Control(VP9E_SET_MIN_GF_INTERVAL, kDefaultMinGfInterval);
       encoder->Control(VP9E_SET_MAX_GF_INTERVAL, kDefaultMaxGfInterval);
+      encoder->Control(VP9E_SET_TARGET_LEVEL, vp9::LEVEL_UNKNOWN);
 
       vpx_rc_funcs_t rc_funcs;
       rc_funcs.rc_type = VPX_RC_GOP_QP;
@@ -847,6 +849,7 @@ class ExtRateCtrlTestGOPShortNoARF
     if (video->frame() == 0) {
       encoder->Control(VP9E_SET_MIN_GF_INTERVAL, kDefaultMinGfInterval);
       encoder->Control(VP9E_SET_MAX_GF_INTERVAL, kDefaultMaxGfInterval);
+      encoder->Control(VP9E_SET_TARGET_LEVEL, vp9::LEVEL_AUTO);
 
       vpx_rc_funcs_t rc_funcs;
       rc_funcs.rc_type = VPX_RC_GOP_QP;