Init frames_to_key in vp9_rc_init()

Change-Id: Ic667c77ff58672212fc2e9dd5066c650b0152226

diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c
index e3f622f9b10008617363e369d719acdd1967df06..0bda4b7d66c85ea5358cb1cca260accc1f78bc89 100644 (file)
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -3749,8 +3749,8 @@ int vp9_get_coding_frame_num(const int *external_arf_indexes,
   int gop_show_frames;
   int show_idx = 0;
   int last_gop_use_alt_ref = 0;
-  rc.static_scene_max_gf_interval = 250;
   vp9_rc_init(oxcf, 1, &rc);
+  rc.static_scene_max_gf_interval = 250;
 
   while (show_idx < first_pass_info->num_frames) {
     int use_alt_ref;

diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c
index 5aff95205ccc2a39ce46231c92a8317e922f8adc..316090e8410c6758a118132d85b9e93aaebd2f64 100644 (file)
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -402,6 +402,7 @@ void vp9_rc_init(const VP9EncoderConfig *oxcf, int pass, RATE_CONTROL *rc) {
   rc->fac_active_worst_gf = 100;
   rc->force_qpmin = 0;
   for (i = 0; i < MAX_LAG_BUFFERS; ++i) rc->avg_source_sad[i] = 0;
+  rc->frames_to_key = 0;
   rc->frames_since_key = 8;  // Sensible default for first frame.
   rc->this_key_frame_forced = 0;
   rc->next_key_frame_forced = 0;