diff options
| author | Cheng Chen <chengchen@google.com> | 2022-08-08 10:12:39 -0700 |
|---|---|---|
| committer | Cheng Chen <chengchen@google.com> | 2022-08-08 17:35:52 -0700 |
| commit | ec4aa6d1915a92172539f359ef9e1847ae9ff327 (patch) | |
| tree | 1fb9ce40b801da9e10ac1a1ab06cfce344790d89 /test | |
| parent | 3cf0a241569efd53fa9a9bd62d963278106816c6 (diff) | |
| download | libvpx-ec4aa6d1915a92172539f359ef9e1847ae9ff327.tar libvpx-ec4aa6d1915a92172539f359ef9e1847ae9ff327.tar.gz libvpx-ec4aa6d1915a92172539f359ef9e1847ae9ff327.tar.bz2 libvpx-ec4aa6d1915a92172539f359ef9e1847ae9ff327.zip | |
Use level defined min gf interval
Assume the level definition of min_gf_interval is the minimum allowed
gf_interval. We take this level comformant min_gf_interval instead of
+1.
Change-Id: I9c7e62f210c95b356e9716579ee4c19638de8e35
Diffstat (limited to 'test')
| -rw-r--r-- | test/vp9_ext_ratectrl_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/vp9_ext_ratectrl_test.cc b/test/vp9_ext_ratectrl_test.cc index 6687f7fec..16e3248f7 100644 --- 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 + 1); + EXPECT_EQ(gop_info->min_gf_interval, kDefaultMinGfInterval); 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 + 1); + EXPECT_EQ(gop_info->min_gf_interval, kDefaultMinGfInterval); EXPECT_EQ(gop_info->max_gf_interval, kDefaultMaxGfInterval); EXPECT_EQ(gop_info->allow_alt_ref, 1); if (gop_info->is_key_frame) { @@ -800,7 +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); + encoder->Control(VP9E_SET_TARGET_LEVEL, vp9::LEVEL_AUTO); vpx_rc_funcs_t rc_funcs; rc_funcs.rc_type = VPX_RC_GOP_QP; |