commit 181988d37273bd31708718a51e727ea1048d7c98
author Marco Paniconi <marpan@google.com> Fri Jun 10 22:49:48 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 10 22:49:48 2016 +0000
tree 67ffbdb829cda48c790757f4168e23b19e96b8dc
parent c1bfa6a84647caf16a9191bb58ab90599ddd9a80
parent 9b61c709c4730ae841d8e063d2a656198b1d0a65

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

vp9/encoder/vp9_ratectrl.c

diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c
index 291e787..b45f8d0 100644
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -1514,6 +1514,8 @@
   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.