diff options
Diffstat (limited to 'vp8/common/entropymode.h')
| -rw-r--r-- | vp8/common/entropymode.h | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/vp8/common/entropymode.h b/vp8/common/entropymode.h index f66c1c859..f9cc263b9 100644 --- a/vp8/common/entropymode.h +++ b/vp8/common/entropymode.h @@ -12,9 +12,12 @@ #ifndef __INC_ENTROPYMODE_H #define __INC_ENTROPYMODE_H -#include "onyxc_int.h" +#include "blockd.h" #include "treecoder.h" +#define SUBMVREF_COUNT 5 +#define VP8_NUMMBSPLITS 4 + typedef const int vp8_mbsplit[16]; extern vp8_mbsplit vp8_mbsplits [VP8_NUMMBSPLITS]; @@ -56,10 +59,11 @@ extern struct vp8_token_struct vp8_sub_mv_ref_encoding_array [VP8_SUBMVREFS]; void vp8_entropy_mode_init(void); -void vp8_init_mbmode_probs(VP8_COMMON *x); -extern void vp8_init_mode_contexts(VP8_COMMON *pc); -extern void vp8_update_mode_context(VP8_COMMON *pc);; -extern void vp8_accum_mv_refs(VP8_COMMON *pc, +struct VP8Common; +void vp8_init_mbmode_probs(struct VP8Common *x); +extern void vp8_init_mode_contexts(struct VP8Common *pc); +extern void vp8_update_mode_context(struct VP8Common *pc);; +extern void vp8_accum_mv_refs(struct VP8Common *pc, MB_PREDICTION_MODE m, const int ct[4]); @@ -67,4 +71,17 @@ void vp8_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES - 1]); void vp8_kf_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES] [VP8_BINTRAMODES] [VP8_BINTRAMODES - 1]); void vp8_adapt_mode_probs(struct VP8Common *); + +#if CONFIG_SWITCHABLE_INTERP +#define VP8_SWITCHABLE_FILTERS 2 /* number of switchable filters */ +extern const INTERPOLATIONFILTERTYPE vp8_switchable_interp + [VP8_SWITCHABLE_FILTERS]; +extern const int vp8_switchable_interp_map[SWITCHABLE+1]; +extern const vp8_tree_index vp8_switchable_interp_tree + [2*(VP8_SWITCHABLE_FILTERS-1)]; +extern struct vp8_token_struct vp8_switchable_interp_encodings + [VP8_SWITCHABLE_FILTERS]; +extern const vp8_prob vp8_switchable_interp_prob + [VP8_SWITCHABLE_FILTERS+1][VP8_SWITCHABLE_FILTERS-1]; +#endif #endif |