From: Dmitry Kovalev <dkovalev@google.com>
Date: Thu, 22 May 2014 20:49:28 +0000 (-0700)
Subject: Merge "Cleaning up calculate_section_intra_ratio()."
X-Git-Tag: v1.4.0~1514
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=59948cc343738bec2cbfa6a791865a8189f5f3f2;p=libvpx

Merge "Cleaning up calculate_section_intra_ratio()."
---

59948cc343738bec2cbfa6a791865a8189f5f3f2
diff --cc vp9/encoder/vp9_firstpass.c
index 4d7cedf99,3a56c979b..5738028b2
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@@ -1506,10 -1508,9 +1498,9 @@@ static void define_gf_group(VP9_COMP *c
    vp9_zero(next_frame);
  
    twopass->gf_group_bits = 0;
-   start_pos = twopass->stats_in;
  
    // Load stats for the current frame.
 -  mod_frame_err = calculate_modified_err(cpi, this_frame);
 +  mod_frame_err = calculate_modified_err(twopass, oxcf, this_frame);
  
    // Note the error of the frame at the start of the group. This will be
    // the GF frame error if we code a normal gf.
@@@ -1875,9 -1877,8 +1868,9 @@@ static void find_next_key_frame(VP9_COM
    int i, j;
    RATE_CONTROL *const rc = &cpi->rc;
    TWO_PASS *const twopass = &cpi->twopass;
 +  const VP9EncoderConfig *const oxcf = &cpi->oxcf;
    const FIRSTPASS_STATS first_frame = *this_frame;
-   const FIRSTPASS_STATS *start_position = twopass->stats_in;
+   const FIRSTPASS_STATS *const start_position = twopass->stats_in;
    FIRSTPASS_STATS next_frame;
    FIRSTPASS_STATS last_frame;
    double decay_accumulator = 1.0;