diff options
Diffstat (limited to 'vp8/encoder/block.h')
| -rw-r--r-- | vp8/encoder/block.h | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/vp8/encoder/block.h b/vp8/encoder/block.h index 106036a0d..0019d5e8c 100644 --- a/vp8/encoder/block.h +++ b/vp8/encoder/block.h @@ -35,8 +35,14 @@ typedef struct { unsigned char *quant_shift; short *zbin; short *zbin_8x8; +#if CONFIG_TX16X16 + short *zbin_16x16; +#endif short *zrun_zbin_boost; short *zrun_zbin_boost_8x8; +#if CONFIG_TX16X16 + short *zrun_zbin_boost_16x16; +#endif short *round; // Zbin Over Quant value @@ -49,7 +55,9 @@ typedef struct { int eob_max_offset; int eob_max_offset_8x8; - +#if CONFIG_TX16X16 + int eob_max_offset_16x16; +#endif } BLOCK; typedef struct { @@ -153,9 +161,13 @@ typedef struct { #endif unsigned int token_costs[BLOCK_TYPES] [COEF_BANDS] - [PREV_COEF_CONTEXTS][MAX_ENTROPY_TOKENS]; + [PREV_COEF_CONTEXTS][MAX_ENTROPY_TOKENS]; unsigned int token_costs_8x8[BLOCK_TYPES_8X8] [COEF_BANDS] - [PREV_COEF_CONTEXTS] [MAX_ENTROPY_TOKENS]; + [PREV_COEF_CONTEXTS][MAX_ENTROPY_TOKENS]; +#if CONFIG_TX16X16 + unsigned int token_costs_16x16[BLOCK_TYPES_16X16] [COEF_BANDS] + [PREV_COEF_CONTEXTS][MAX_ENTROPY_TOKENS]; +#endif int optimize; int q_index; @@ -176,7 +188,13 @@ typedef struct { void (*quantize_b)(BLOCK *b, BLOCKD *d); void (*quantize_b_pair)(BLOCK *b1, BLOCK *b2, BLOCKD *d0, BLOCKD *d1); void (*vp8_short_fdct8x8)(short *input, short *output, int pitch); +#if CONFIG_TX16X16 + void (*vp8_short_fdct16x16)(short *input, short *output, int pitch); +#endif void (*short_fhaar2x2)(short *input, short *output, int pitch); +#if CONFIG_TX16X16 + void (*quantize_b_16x16)(BLOCK *b, BLOCKD *d); +#endif void (*quantize_b_8x8)(BLOCK *b, BLOCKD *d); void (*quantize_b_2x2)(BLOCK *b, BLOCKD *d); |