commit cfd59e96ac52938662cbae9ccfbd6c3654d0c789
author Urvang Joshi <urvang@google.com> Wed Aug 07 09:54:31 2019 -0700
committer Urvang Joshi <urvang@google.com> Fri Aug 09 05:38:50 2019 +0000
tree 82ef9fdbd9462ede45eb5c5015980f613df70b8e
parent b4c93f0091ddef44e1f03290d8c52ca8d4f76d09

Avoid very short KF intervals for Q mode only.

Using this strategy for VBR mode seems to hurt some clips.

STATS_CHANGED

Change-Id: I9ebd0480eed4837538d6b1cb2f9898153203a983

av1/encoder/pass2_strategy.c

diff --git a/av1/encoder/pass2_strategy.c b/av1/encoder/pass2_strategy.c
index eb74fb6..735acc8 100644
--- a/av1/encoder/pass2_strategy.c
+++ b/av1/encoder/pass2_strategy.c
@@ -1260,7 +1260,7 @@
                              const FIRSTPASS_STATS *last_frame,
                              const FIRSTPASS_STATS *this_frame,
                              const FIRSTPASS_STATS *next_frame,
-                             int frame_count_so_far) {
+                             int frame_count_so_far, enum aom_rc_mode rc_mode) {
   int is_viable_kf = 0;
   double pcnt_intra = 1.0 - this_frame->pcnt_inter;
   double modified_pcnt_inter =
@@ -1271,7 +1271,7 @@
   // Does the frame satisfy the primary criteria of a key frame?
   // See above for an explanation of the test criteria.
   // If so, then examine how well it predicts subsequent frames.
-  if (frame_count_so_far >= 3 &&
+  if (IMPLIES(rc_mode == AOM_Q, frame_count_so_far >= 3) &&
       (this_frame->pcnt_second_ref < second_ref_usage_thresh) &&
       (next_frame->pcnt_second_ref < second_ref_usage_thresh) &&
       ((this_frame->pcnt_inter < VERY_LOW_INTER_THRESH) ||
@@ -1422,7 +1422,7 @@
 
       // Check for a scene cut.
       if (test_candidate_kf(twopass, &last_frame, this_frame, twopass->stats_in,
-                            rc->frames_to_key))
+                            rc->frames_to_key, oxcf->rc_mode))
         break;
 
       // How fast is the prediction quality decaying?