libvpx: Pull from upstream

source/libvpx/vp9/encoder/vp9_ratectrl.h

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 82 matching lines @@
   int ni_av_qi;
   int ni_tot_qi;
   int ni_frames;
   int avg_frame_qindex[FRAME_TYPES];
   double tot_q;
   double avg_q;
 
   int64_t buffer_level;
   int64_t bits_off_target;
   int64_t vbr_bits_off_target;
+  int64_t vbr_bits_off_target_fast;
 
   int decimation_factor;
   int decimation_count;
 
   int rolling_target_bits;
   int rolling_actual_bits;
 
   int long_rolling_target_bits;
   int long_rolling_actual_bits;
 
@@ skipping 32 matching lines @@
 
 void vp9_rc_init(const struct VP9EncoderConfig *oxcf, int pass,
                  RATE_CONTROL *rc);
 
 int vp9_estimate_bits_at_q(FRAME_TYPE frame_kind, int q, int mbs,
                            double correction_factor,
                            vpx_bit_depth_t bit_depth);
 
 double vp9_convert_qindex_to_q(int qindex, vpx_bit_depth_t bit_depth);
 
-void vp9_rc_init_minq_luts();
+void vp9_rc_init_minq_luts(void);
 
 // Generally at the high level, the following flow is expected
 // to be enforced for rate control:
 // First call per frame, one of:
 //   vp9_rc_get_one_pass_vbr_params()
 //   vp9_rc_get_one_pass_cbr_params()
 //   vp9_rc_get_svc_params()
 //   vp9_rc_get_first_pass_params()
 //   vp9_rc_get_second_pass_params()
 // depending on the usage to set the rate control encode parameters desired.
@@ skipping 76 matching lines @@
 void vp9_rc_set_gf_interval_range(const struct VP9_COMP *const cpi,
                                   RATE_CONTROL *const rc);
 
 void vp9_set_target_rate(struct VP9_COMP *cpi);
 
 #ifdef __cplusplus
 }  // extern "C"
 #endif
 
 #endif  // VP9_ENCODER_VP9_RATECTRL_H_