diff options
Diffstat (limited to 'vp8/common/entropymode.h')
| -rw-r--r-- | vp8/common/entropymode.h | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/vp8/common/entropymode.h b/vp8/common/entropymode.h index c66d6caae..ff22fa014 100644 --- a/vp8/common/entropymode.h +++ b/vp8/common/entropymode.h @@ -18,48 +18,48 @@ #define SUBMVREF_COUNT 5 #define VP8_NUMMBSPLITS 4 -typedef const int vp8_mbsplit[16]; +typedef const int vp9_mbsplit[16]; -extern vp8_mbsplit vp8_mbsplits [VP8_NUMMBSPLITS]; +extern vp9_mbsplit vp9_mbsplits [VP8_NUMMBSPLITS]; -extern const int vp8_mbsplit_count [VP8_NUMMBSPLITS]; /* # of subsets */ +extern const int vp9_mbsplit_count [VP8_NUMMBSPLITS]; /* # of subsets */ -extern const vp8_prob vp8_mbsplit_probs [VP8_NUMMBSPLITS - 1]; +extern const vp8_prob vp9_mbsplit_probs [VP8_NUMMBSPLITS - 1]; extern int vp9_mv_cont(const int_mv *l, const int_mv *a); -extern const vp8_prob vp8_sub_mv_ref_prob [VP8_SUBMVREFS - 1]; -extern const vp8_prob vp8_sub_mv_ref_prob2 [SUBMVREF_COUNT][VP8_SUBMVREFS - 1]; +extern const vp8_prob vp9_sub_mv_ref_prob [VP8_SUBMVREFS - 1]; +extern const vp8_prob vp9_sub_mv_ref_prob2 [SUBMVREF_COUNT][VP8_SUBMVREFS - 1]; -extern const unsigned int vp8_kf_default_bmode_counts [VP8_BINTRAMODES] [VP8_BINTRAMODES] [VP8_BINTRAMODES]; +extern const unsigned int vp9_kf_default_bmode_counts[VP8_BINTRAMODES][VP8_BINTRAMODES][VP8_BINTRAMODES]; -extern const vp8_tree_index vp8_bmode_tree[]; +extern const vp8_tree_index vp9_bmode_tree[]; -extern const vp8_tree_index vp8_ymode_tree[]; -extern const vp8_tree_index vp8_kf_ymode_tree[]; -extern const vp8_tree_index vp8_uv_mode_tree[]; -#define vp8_sb_ymode_tree vp8_uv_mode_tree -extern const vp8_tree_index vp8_i8x8_mode_tree[]; -extern const vp8_tree_index vp8_mbsplit_tree[]; -extern const vp8_tree_index vp8_mv_ref_tree[]; -extern const vp8_tree_index vp8_sb_mv_ref_tree[]; -extern const vp8_tree_index vp8_sub_mv_ref_tree[]; +extern const vp8_tree_index vp9_ymode_tree[]; +extern const vp8_tree_index vp9_kf_ymode_tree[]; +extern const vp8_tree_index vp9_uv_mode_tree[]; +#define vp8_sb_ymode_tree vp9_uv_mode_tree +extern const vp8_tree_index vp9_i8x8_mode_tree[]; +extern const vp8_tree_index vp9_mbsplit_tree[]; +extern const vp8_tree_index vp9_mv_ref_tree[]; +extern const vp8_tree_index vp9_sb_mv_ref_tree[]; +extern const vp8_tree_index vp9_sub_mv_ref_tree[]; -extern struct vp8_token_struct vp8_bmode_encodings [VP8_BINTRAMODES]; -extern struct vp8_token_struct vp8_ymode_encodings [VP8_YMODES]; -extern struct vp8_token_struct vp8_sb_kf_ymode_encodings [VP8_I32X32_MODES]; -extern struct vp8_token_struct vp8_kf_ymode_encodings [VP8_YMODES]; -extern struct vp8_token_struct vp8_i8x8_mode_encodings [VP8_I8X8_MODES]; -extern struct vp8_token_struct vp8_uv_mode_encodings [VP8_UV_MODES]; -extern struct vp8_token_struct vp8_mbsplit_encodings [VP8_NUMMBSPLITS]; +extern struct vp8_token_struct vp9_bmode_encodings [VP8_BINTRAMODES]; +extern struct vp8_token_struct vp9_ymode_encodings [VP8_YMODES]; +extern struct vp8_token_struct vp9_sb_kf_ymode_encodings [VP8_I32X32_MODES]; +extern struct vp8_token_struct vp9_kf_ymode_encodings [VP8_YMODES]; +extern struct vp8_token_struct vp9_i8x8_mode_encodings [VP8_I8X8_MODES]; +extern struct vp8_token_struct vp9_uv_mode_encodings [VP8_UV_MODES]; +extern struct vp8_token_struct vp9_mbsplit_encodings [VP8_NUMMBSPLITS]; /* Inter mode values do not start at zero */ -extern struct vp8_token_struct vp8_mv_ref_encoding_array [VP8_MVREFS]; -extern struct vp8_token_struct vp8_sb_mv_ref_encoding_array [VP8_MVREFS]; -extern struct vp8_token_struct vp8_sub_mv_ref_encoding_array [VP8_SUBMVREFS]; +extern struct vp8_token_struct vp9_mv_ref_encoding_array [VP8_MVREFS]; +extern struct vp8_token_struct vp9_sb_mv_ref_encoding_array [VP8_MVREFS]; +extern struct vp8_token_struct vp9_sub_mv_ref_encoding_array [VP8_SUBMVREFS]; void vp9_entropy_mode_init(void); @@ -77,13 +77,13 @@ void vp9_kf_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES] [VP8_BINTRAMODES void vp9_adapt_mode_probs(struct VP8Common *); #define VP8_SWITCHABLE_FILTERS 2 /* number of switchable filters */ -extern const INTERPOLATIONFILTERTYPE vp8_switchable_interp +extern const INTERPOLATIONFILTERTYPE vp9_switchable_interp [VP8_SWITCHABLE_FILTERS]; -extern const int vp8_switchable_interp_map[SWITCHABLE + 1]; -extern const vp8_tree_index vp8_switchable_interp_tree +extern const int vp9_switchable_interp_map[SWITCHABLE + 1]; +extern const vp8_tree_index vp9_switchable_interp_tree [2*(VP8_SWITCHABLE_FILTERS - 1)]; -extern struct vp8_token_struct vp8_switchable_interp_encodings +extern struct vp8_token_struct vp9_switchable_interp_encodings [VP8_SWITCHABLE_FILTERS]; -extern const vp8_prob vp8_switchable_interp_prob +extern const vp8_prob vp9_switchable_interp_prob [VP8_SWITCHABLE_FILTERS + 1][VP8_SWITCHABLE_FILTERS - 1]; #endif |