libvpx: Pull from upstream

source/libvpx/vp8/encoder/onyx_int.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 25 matching lines @@
 #define MIN_GF_INTERVAL             4
 #define DEFAULT_GF_INTERVAL         7
 
 #define KEY_FRAME_CONTEXT 5
 
 #define MAX_LAG_BUFFERS (CONFIG_REALTIME_ONLY? 1 : 25)
 
 #define AF_THRESH   25
 #define AF_THRESH2  100
 #define ARF_DECAY_THRESH 12
-#define MAX_MODES 20
+
 
 #define MIN_THRESHMULT  32
 #define MAX_THRESHMULT  512
 
 #define GF_ZEROMV_ZBIN_BOOST 12
 #define LF_ZEROMV_ZBIN_BOOST 6
 #define MV_ZBIN_BOOST        4
 #define ZBIN_OQ_MAX 192
 
 #if !(CONFIG_REALTIME_ONLY)
@@ skipping 285 matching lines @@
 
     unsigned int frames_since_key;
     unsigned int key_frame_frequency;
     unsigned int this_key_frame_forced;
     unsigned int next_key_frame_forced;
 
     /* Ambient reconstruction err target for force key frames */
     int ambient_err;
 
     unsigned int mode_check_freq[MAX_MODES];
-    unsigned int mode_test_hit_counts[MAX_MODES];
     unsigned int mode_chosen_counts[MAX_MODES];
-    unsigned int mbs_tested_so_far;
 
-    int rd_thresh_mult[MAX_MODES];
     int rd_baseline_thresh[MAX_MODES];
-    int rd_threshes[MAX_MODES];
 
     int RDMULT;
     int RDDIV ;
 
     CODING_CONTEXT coding_context;
 
     /* Rate targetting variables */
-    int64_t prediction_error;
     int64_t last_prediction_error;
-    int64_t intra_error;
     int64_t last_intra_error;
 
     int this_frame_target;
     int projected_frame_size;
     int last_q[2];                   /* Separate values for Intra/Inter */
 
     double rate_correction_factor;
     double key_frame_rate_correction_factor;
     double gf_rate_correction_factor;
 
@@ skipping 32 matching lines @@
     double output_frame_rate;
     int64_t last_time_stamp_seen;
     int64_t last_end_time_stamp_seen;
     int64_t first_time_stamp_ever;
 
     int ni_av_qi;
     int ni_tot_qi;
     int ni_frames;
     int avg_frame_qindex;
 
-    int zbin_over_quant;
-    int zbin_mode_boost;
-    int zbin_mode_boost_enabled;
-    int last_zbin_over_quant;
-    int last_zbin_mode_boost;
-
     int64_t total_byte_count;
 
     int buffered_mode;
 
     double frame_rate;
     double ref_frame_rate;
     int64_t buffer_level;
     int64_t bits_off_target;
 
     int rolling_target_bits;
     int rolling_actual_bits;
 
     int long_rolling_target_bits;
     int long_rolling_actual_bits;
 
     int64_t total_actual_bits;
     int total_target_vs_actual; /* debug stats */
 
     int worst_quality;
     int active_worst_quality;
     int best_quality;
     int active_best_quality;
 
     int cq_target_quality;
 
     int drop_frames_allowed; /* Are we permitted to drop frames? */
     int drop_frame;          /* Drop this frame? */
 
-    int ymode_count [VP8_YMODES];        /* intra MB type cts this frame */
-    int uv_mode_count[VP8_UV_MODES];     /* intra MB type cts this frame */
-
-    unsigned int MVcount [2] [MVvals];  /* (row,col) MV cts this frame */
-
-    unsigned int coef_counts [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [MAX_ENTROPY_TOKENS];  /* for this frame */
-
     vp8_prob frame_coef_probs [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES];
     char update_probs [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES];
 
     unsigned int frame_branch_ct [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES][2];
 
     int gfu_boost;
     int kf_boost;
     int last_boost;
 
     int target_bandwidth;
     struct vpx_codec_pkt_list  *output_pkt_list;
 
 #if 0
     /* Experimental code for lagged and one pass */
     ONEPASS_FRAMESTATS one_pass_frame_stats[MAX_LAG_BUFFERS];
     int one_pass_frame_index;
 #endif
 
     int decimation_factor;
     int decimation_count;
 
     /* for real time encoding */
     int avg_encode_time;     /* microsecond */
     int avg_pick_mode_time;  /* microsecond */
     int Speed;
     int compressor_speed;
 
-    int interquantizer;
     int auto_gold;
     int auto_adjust_gold_quantizer;
     int auto_worst_q;
     int cpu_used;
     int pass;
 
 
     int prob_intra_coded;
     int prob_last_coded;
     int prob_gf_coded;
     int prob_skip_false;
     int last_skip_false_probs[3];
     int last_skip_probs_q[3];
     int recent_ref_frame_usage[MAX_REF_FRAMES];
 
-    int count_mb_ref_frame_usage[MAX_REF_FRAMES];
     int this_frame_percent_intra;
     int last_frame_percent_intra;
 
     int ref_frame_flags;
 
     SPEED_FEATURES sf;
-    int error_bins[1024];
 
-    /* Data used for real time conferencing mode to help determine if it
-     * would be good to update the gf
-     */
-    int inter_zz_count;
     /* Count ZEROMV on all reference frames. */
     int zeromv_count;
     int lf_zeromv_pct;
-    int gf_bad_count;
-    int gf_update_recommended;
-    int skip_true_count;
 
     unsigned char *segmentation_map;
     signed char segment_feature_data[MB_LVL_MAX][MAX_MB_SEGMENTS];
     int  segment_encode_breakout[MAX_MB_SEGMENTS];
 
     unsigned char *active_map;
     unsigned int active_map_enabled;
 
     /* Video conferencing cyclic refresh mode flags. This is a mode
      * designed to clean up the background over time in live encoding
@@ skipping 118 matching lines @@
     double total_ssimg_v;
     double total_ssimg_all;
 
     int b_calculate_ssimg;
 #endif
     int b_calculate_psnr;
 
     /* Per MB activity measurement */
     unsigned int activity_avg;
     unsigned int * mb_activity_map;
-    int * mb_norm_activity_map;
 
     /* Record of which MBs still refer to last golden frame either
      * directly or through 0,0
      */
     unsigned char *gf_active_flags;
     int gf_active_count;
 
     int output_partition;
 
     /* Store last frame's MV info for next frame MV prediction */
@@ skipping 43 matching lines @@
         int mvsadcosts[2][MVfpvals+1];
         int mbmode_cost[2][MB_MODE_COUNT];
         int intra_uv_mode_cost[2][MB_MODE_COUNT];
         int bmode_costs[10][10][10];
         int inter_bmode_costs[B_MODE_COUNT];
         int token_costs[BLOCK_TYPES][COEF_BANDS]
         [PREV_COEF_CONTEXTS][MAX_ENTROPY_TOKENS];
     } rd_costs;
 } VP8_COMP;
 
-void control_data_rate(VP8_COMP *cpi);
+void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest,
+                        unsigned char *dest_end, unsigned long *size);
 
-void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned char *dest_end, unsigned long *size);
-
-int rd_cost_intra_mb(MACROBLOCKD *x);
-
-void vp8_tokenize_mb(VP8_COMP *, MACROBLOCKD *, TOKENEXTRA **);
+void vp8_tokenize_mb(VP8_COMP *, MACROBLOCK *, TOKENEXTRA **);
 
 void vp8_set_speed_features(VP8_COMP *cpi);
 
 #if CONFIG_DEBUG
 #define CHECK_MEM_ERROR(lval,expr) do {\
         lval = (expr); \
         if(!lval) \
             vpx_internal_error(&cpi->common.error, VPX_CODEC_MEM_ERROR,\
                                "Failed to allocate "#lval" at %s:%d", \
                                __FILE__,__LINE__);\
     } while(0)
 #else
 #define CHECK_MEM_ERROR(lval,expr) do {\
         lval = (expr); \
         if(!lval) \
             vpx_internal_error(&cpi->common.error, VPX_CODEC_MEM_ERROR,\
                                "Failed to allocate "#lval);\
     } while(0)
 #endif
 #endif