From: Marco <marpan@google.com>
Date: Fri, 10 Jun 2016 17:04:46 +0000 (-0700)
Subject: vp9: Put lower limit on frames_to_key adjustment to gf interval.
X-Git-Tag: v1.6.0~69^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b61c709c4730ae841d8e063d2a656198b1d0a65;p=libvpx

vp9: Put lower limit on frames_to_key adjustment to gf interval.

For 1 pass vbr.

Change-Id: I6c1c1cca3944150140e896e175b07ed518641b9b
---

diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c
index 291e78721..b45f8d0d9 100644
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -1514,6 +1514,8 @@ static void adjust_gf_key_frame(VP9_COMP *cpi) {
   if ((rc->frames_to_key <= 7 * rc->baseline_gf_interval >> 2) &&
       (rc->frames_to_key > rc->baseline_gf_interval)) {
     rc->baseline_gf_interval = rc->frames_to_key >> 1;
+    if (rc->baseline_gf_interval < 5)
+      rc->baseline_gf_interval = rc->frames_to_key;
     rc->constrained_gf_group = 1;
   } else {
     // Reset since frames_till_gf_update_due must be <= frames_to_key.