Merge "Remove goldfreq in VP8_COMP"

diff --cc vp8/encoder/onyx_if.c
index 4a57d3b279a29d9de640c0fea3f68ad033d1d948,c24e944ee22af75edd26420b96982d4e85a476ac..d50076d3b871116ed8667002ca740a97c360f170
--- 1/vp8/encoder/onyx_if.c
--- 2/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@@ -2652,9 -2666,9 +2651,9 @@@ static void update_alt_ref_frame_stats(
  {
      VP8_COMMON *cm = &cpi->common;
  
 -    // Select an interval before next GF or altref
 +    /* Select an interval before next GF or altref */
      if (!cpi->auto_gold)
-         cpi->frames_till_gf_update_due = cpi->goldfreq;
+         cpi->frames_till_gf_update_due = DEFAULT_GF_INTERVAL;
  
      if ((cpi->pass != 2) && cpi->frames_till_gf_update_due)
      {
@@@ -2689,12 -2702,12 +2688,12 @@@ static void update_golden_frame_stats(V
  {
      VP8_COMMON *cm = &cpi->common;
  
 -    // Update the Golden frame usage counts.
 +    /* Update the Golden frame usage counts. */
      if (cm->refresh_golden_frame)
      {
 -        // Select an interval before next GF
 +        /* Select an interval before next GF */
          if (!cpi->auto_gold)
-             cpi->frames_till_gf_update_due = cpi->goldfreq;
+             cpi->frames_till_gf_update_due = DEFAULT_GF_INTERVAL;
  
          if ((cpi->pass != 2) && (cpi->frames_till_gf_update_due > 0))
          {

diff --cc vp8/encoder/onyx_int.h
Simple merge

diff --cc vp8/encoder/ratectrl.c
index 500c1518bd9300aa2a7d79b7b1b4773e3d1f62ff,2a96d2d25ccf23638726fb4e7bf951c48bf4f3bd..05e152ebecb02dc80a7ef04fd09b015f402ecd76
--- 1/vp8/encoder/ratectrl.c
--- 2/vp8/encoder/ratectrl.c
+++ b/vp8/encoder/ratectrl.c
@@@ -320,13 -315,15 +320,13 @@@ void vp8_setup_key_frame(VP8_COMP *cpi
      vpx_memcpy(&cpi->lfc_g, &cpi->common.fc, sizeof(cpi->common.fc));
      vpx_memcpy(&cpi->lfc_n, &cpi->common.fc, sizeof(cpi->common.fc));
  
 -    //cpi->common.filter_level = 0;      // Reset every key frame.
      cpi->common.filter_level = cpi->common.base_qindex * 3 / 8 ;
  
 -    // Provisional interval before next GF
 +    /* Provisional interval before next GF */
      if (cpi->auto_gold)
 -        //cpi->frames_till_gf_update_due = DEFAULT_GF_INTERVAL;
          cpi->frames_till_gf_update_due = cpi->baseline_gf_interval;
      else
-         cpi->frames_till_gf_update_due = cpi->goldfreq;
+         cpi->frames_till_gf_update_due = DEFAULT_GF_INTERVAL;
  
      cpi->common.refresh_golden_frame = 1;
      cpi->common.refresh_alt_ref_frame = 1;