diff options
| author | angiebird <angiebird@google.com> | 2019-10-25 11:03:19 -0700 |
|---|---|---|
| committer | angiebird <angiebird@google.com> | 2019-10-29 16:34:18 -0700 |
| commit | 46fa3d6b5b0a01d6a68ade4287848ee2a098d9a4 (patch) | |
| tree | 57ffe1a73570913c22a1ca9e62c3086e2c36ff36 /vp9 | |
| parent | d693439beda46732410ecc7b3945132e4ab01511 (diff) | |
| download | libvpx-46fa3d6b5b0a01d6a68ade4287848ee2a098d9a4.tar libvpx-46fa3d6b5b0a01d6a68ade4287848ee2a098d9a4.tar.gz libvpx-46fa3d6b5b0a01d6a68ade4287848ee2a098d9a4.tar.bz2 libvpx-46fa3d6b5b0a01d6a68ade4287848ee2a098d9a4.zip | |
Make [min/max]_gf_interval static under rate_ctrl
Change-Id: I0624c4b44a35c760bb00e4d1a07bb0ac2640ea0b
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_ratectrl.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c index 414869440..cbafbf7b9 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -2477,12 +2477,23 @@ void vp9_rc_set_gf_interval_range(const VP9_COMP *const cpi, // Set Maximum gf/arf interval rc->max_gf_interval = oxcf->max_gf_interval; rc->min_gf_interval = oxcf->min_gf_interval; +#if CONFIG_RATE_CTRL + if (rc->min_gf_interval == 0) { + rc->min_gf_interval = vp9_rc_get_default_min_gf_interval( + oxcf->width, oxcf->height, oxcf->init_framerate); + } + if (rc->max_gf_interval == 0) { + rc->max_gf_interval = vp9_rc_get_default_max_gf_interval( + oxcf->init_framerate, rc->min_gf_interval); + } +#else if (rc->min_gf_interval == 0) rc->min_gf_interval = vp9_rc_get_default_min_gf_interval( oxcf->width, oxcf->height, cpi->framerate); if (rc->max_gf_interval == 0) rc->max_gf_interval = vp9_rc_get_default_max_gf_interval( cpi->framerate, rc->min_gf_interval); +#endif // Extended max interval for genuinely static scenes like slide shows. rc->static_scene_max_gf_interval = MAX_STATIC_GF_GROUP_LENGTH; |