From: Paul Wilkins <paulwilkins@google.com>
Date: Thu, 17 Jul 2014 14:01:31 +0000 (-0700)
Subject: Merge "Changes to rd balance and multi-arf bug fix."
X-Git-Tag: v1.4.0~1207
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93960c869ec590e2cd527fa0fbf5692d3825065e;p=libvpx

Merge "Changes to rd balance and multi-arf bug fix."
---

93960c869ec590e2cd527fa0fbf5692d3825065e
diff --cc vp9/encoder/vp9_firstpass.c
index 2a5f594e9,ff668a816..4715df72c
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@@ -2202,18 -2189,9 +2202,10 @@@ void vp9_rc_get_second_pass_params(VP9_
      }
  
      rc->frames_till_gf_update_due = rc->baseline_gf_interval;
 -    cpi->refresh_golden_frame = 1;
 +    if (!is_spatial_svc)
 +      cpi->refresh_golden_frame = 1;
    }
  
-   {
-     FIRSTPASS_STATS next_frame;
-     if (lookup_next_frame_stats(twopass, &next_frame) != EOF) {
-       twopass->next_iiratio = (int)(next_frame.intra_error /
-                                  DOUBLE_DIVIDE_CHECK(next_frame.coded_error));
-     }
-   }
- 
    configure_buffer_updates(cpi);
  
    target_rate = twopass->gf_group.bit_allocation[twopass->gf_group.index];