diff options
Diffstat (limited to 'vp8/common/entropymode.h')
| -rw-r--r-- | vp8/common/entropymode.h | 59 |
1 files changed, 36 insertions, 23 deletions
diff --git a/vp8/common/entropymode.h b/vp8/common/entropymode.h index 4049eae41..b55e3b0a6 100644 --- a/vp8/common/entropymode.h +++ b/vp8/common/entropymode.h @@ -20,20 +20,21 @@ typedef const int vp9_mbsplit[16]; -extern vp9_mbsplit vp9_mbsplits [VP9_NUMMBSPLITS]; +extern vp9_mbsplit vp9_mbsplits[VP9_NUMMBSPLITS]; -extern const int vp9_mbsplit_count [VP9_NUMMBSPLITS]; /* # of subsets */ +extern const int vp9_mbsplit_count[VP9_NUMMBSPLITS]; /* # of subsets */ -extern const vp9_prob vp9_mbsplit_probs [VP9_NUMMBSPLITS - 1]; +extern const vp9_prob vp9_mbsplit_probs[VP9_NUMMBSPLITS - 1]; extern int vp9_mv_cont(const int_mv *l, const int_mv *a); -extern const vp9_prob vp9_sub_mv_ref_prob [VP9_SUBMVREFS - 1]; -extern const vp9_prob vp9_sub_mv_ref_prob2 [SUBMVREF_COUNT][VP9_SUBMVREFS - 1]; +extern const vp9_prob vp9_sub_mv_ref_prob[VP9_SUBMVREFS - 1]; +extern const vp9_prob vp9_sub_mv_ref_prob2[SUBMVREF_COUNT][VP9_SUBMVREFS - 1]; -extern const unsigned int vp9_kf_default_bmode_counts[VP9_BINTRAMODES][VP9_BINTRAMODES][VP9_BINTRAMODES]; - +extern const unsigned int vp9_kf_default_bmode_counts[VP9_BINTRAMODES] + [VP9_BINTRAMODES] + [VP9_BINTRAMODES]; extern const vp9_tree_index vp9_bmode_tree[]; @@ -47,43 +48,55 @@ extern const vp9_tree_index vp9_mv_ref_tree[]; extern const vp9_tree_index vp9_sb_mv_ref_tree[]; extern const vp9_tree_index vp9_sub_mv_ref_tree[]; -extern struct vp9_token_struct vp9_bmode_encodings [VP9_BINTRAMODES]; -extern struct vp9_token_struct vp9_ymode_encodings [VP9_YMODES]; -extern struct vp9_token_struct vp9_sb_kf_ymode_encodings [VP9_I32X32_MODES]; -extern struct vp9_token_struct vp9_kf_ymode_encodings [VP9_YMODES]; -extern struct vp9_token_struct vp9_i8x8_mode_encodings [VP9_I8X8_MODES]; -extern struct vp9_token_struct vp9_uv_mode_encodings [VP9_UV_MODES]; -extern struct vp9_token_struct vp9_mbsplit_encodings [VP9_NUMMBSPLITS]; +extern struct vp9_token_struct vp9_bmode_encodings[VP9_BINTRAMODES]; +extern struct vp9_token_struct vp9_ymode_encodings[VP9_YMODES]; +extern struct vp9_token_struct vp9_sb_kf_ymode_encodings[VP9_I32X32_MODES]; +extern struct vp9_token_struct vp9_kf_ymode_encodings[VP9_YMODES]; +extern struct vp9_token_struct vp9_i8x8_mode_encodings[VP9_I8X8_MODES]; +extern struct vp9_token_struct vp9_uv_mode_encodings[VP9_UV_MODES]; +extern struct vp9_token_struct vp9_mbsplit_encodings[VP9_NUMMBSPLITS]; /* Inter mode values do not start at zero */ -extern struct vp9_token_struct vp9_mv_ref_encoding_array [VP9_MVREFS]; -extern struct vp9_token_struct vp9_sb_mv_ref_encoding_array [VP9_MVREFS]; -extern struct vp9_token_struct vp9_sub_mv_ref_encoding_array [VP9_SUBMVREFS]; +extern struct vp9_token_struct vp9_mv_ref_encoding_array[VP9_MVREFS]; +extern struct vp9_token_struct vp9_sb_mv_ref_encoding_array[VP9_MVREFS]; +extern struct vp9_token_struct vp9_sub_mv_ref_encoding_array[VP9_SUBMVREFS]; void vp9_entropy_mode_init(void); struct VP9Common; + void vp9_init_mbmode_probs(struct VP9Common *x); + extern void vp9_init_mode_contexts(struct VP9Common *pc); -extern void vp9_update_mode_context(struct VP9Common *pc);; + +extern void vp9_update_mode_context(struct VP9Common *pc); + extern void vp9_accum_mv_refs(struct VP9Common *pc, MB_PREDICTION_MODE m, const int ct[4]); -void vp9_default_bmode_probs(vp9_prob dest [VP9_BINTRAMODES - 1]); -void vp9_kf_default_bmode_probs(vp9_prob dest [VP9_BINTRAMODES] [VP9_BINTRAMODES] [VP9_BINTRAMODES - 1]); +void vp9_default_bmode_probs(vp9_prob dest[VP9_BINTRAMODES - 1]); + +void vp9_kf_default_bmode_probs(vp9_prob dest[VP9_BINTRAMODES][VP9_BINTRAMODES] + [VP9_BINTRAMODES - 1]); void vp9_adapt_mode_probs(struct VP9Common *); #define VP9_SWITCHABLE_FILTERS 2 /* number of switchable filters */ + extern const INTERPOLATIONFILTERTYPE vp9_switchable_interp [VP9_SWITCHABLE_FILTERS]; + extern const int vp9_switchable_interp_map[SWITCHABLE + 1]; + extern const vp9_tree_index vp9_switchable_interp_tree - [2*(VP9_SWITCHABLE_FILTERS - 1)]; + [2 * (VP9_SWITCHABLE_FILTERS - 1)]; + extern struct vp9_token_struct vp9_switchable_interp_encodings [VP9_SWITCHABLE_FILTERS]; -extern const vp9_prob vp9_switchable_interp_prob - [VP9_SWITCHABLE_FILTERS + 1][VP9_SWITCHABLE_FILTERS - 1]; + +extern const vp9_prob vp9_switchable_interp_prob[VP9_SWITCHABLE_FILTERS + 1] + [VP9_SWITCHABLE_FILTERS - 1]; + #endif |