diff options
Diffstat (limited to 'vp8/decoder/onyxd_int.h')
| -rw-r--r-- | vp8/decoder/onyxd_int.h | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/vp8/decoder/onyxd_int.h b/vp8/decoder/onyxd_int.h index be6ffe6be..6309915ab 100644 --- a/vp8/decoder/onyxd_int.h +++ b/vp8/decoder/onyxd_int.h @@ -21,6 +21,8 @@ #include "ec_types.h" #endif +//#define DEC_DEBUG + typedef struct { int ithread; @@ -42,21 +44,35 @@ typedef struct int size; } DATARATE; +#if CONFIG_EXTEND_QRANGE typedef struct { - INT16 min_val; - INT16 Length; + INT16 min_val; + INT16 Length; + UINT8 Probs[14]; +} TOKENEXTRABITS; +#else +typedef struct +{ + INT16 min_val; + INT16 Length; UINT8 Probs[12]; } TOKENEXTRABITS; - +#endif typedef struct { int const *scan; +#if CONFIG_T8X8 + int const *scan_8x8; +#endif UINT8 const *ptr_block2leftabove; vp8_tree_index const *vp8_coef_tree_ptr; TOKENEXTRABITS const *teb_base_ptr; unsigned char *norm_ptr; UINT8 *ptr_coef_bands_x; +#if CONFIG_T8X8 + UINT8 *ptr_coef_bands_x_8x8; +#endif ENTROPY_CONTEXT_PLANES *A; ENTROPY_CONTEXT_PLANES *L; @@ -65,6 +81,9 @@ typedef struct BOOL_DECODER *current_bc; vp8_prob const *coef_probs[4]; +#if CONFIG_T8X8 + vp8_prob const *coef_probs_8x8[4]; +#endif UINT8 eob[25]; @@ -86,7 +105,9 @@ typedef struct VP8Decompressor const unsigned char *partitions[MAX_PARTITIONS]; unsigned int partition_sizes[MAX_PARTITIONS]; unsigned int num_partitions; - +#if CONFIG_SEGMENTATION + unsigned char *segmentation_map; +#endif #if CONFIG_MULTITHREAD /* variable for threading */ @@ -95,7 +116,6 @@ typedef struct VP8Decompressor int current_mb_col_main; int decoding_thread_count; int allocated_decoding_thread_count; - int mt_baseline_filter_level[MAX_MB_SEGMENTS]; int sync_range; int *mt_current_mb_col; /* Each row remembers its already decoded column. */ |