diff options
author | Daniel Kang <ddkang@google.com> | 2012-08-06 11:38:50 -0700 |
---|---|---|
committer | Daniel Kang <ddkang@google.com> | 2012-08-06 15:55:54 -0700 |
commit | 9921b55b22df4e2e1053395844903d9f4800014e (patch) | |
tree | a4dda9c7971f7a4ef86800e0a756912cfab8ccb0 /vp8/encoder/block.h | |
parent | 680af9acd555e439cc62b49302529dc7641a1670 (diff) | |
download | libvpx-9921b55b22df4e2e1053395844903d9f4800014e.tar libvpx-9921b55b22df4e2e1053395844903d9f4800014e.tar.gz libvpx-9921b55b22df4e2e1053395844903d9f4800014e.tar.bz2 libvpx-9921b55b22df4e2e1053395844903d9f4800014e.zip |
Merge token_costs into a single table.
Change-Id: Id1ea2d543f12d4589df7038d5fb7bac1fee4da11
Diffstat (limited to 'vp8/encoder/block.h')
-rw-r--r-- | vp8/encoder/block.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/vp8/encoder/block.h b/vp8/encoder/block.h index 2c1e29cc0..dfc1d743e 100644 --- a/vp8/encoder/block.h +++ b/vp8/encoder/block.h @@ -157,14 +157,8 @@ typedef struct { MV_CONTEXT *mvc; MV_CONTEXT_HP *mvc_hp; - unsigned int token_costs[BLOCK_TYPES] [COEF_BANDS] + unsigned int token_costs[TX_SIZE_MAX][BLOCK_TYPES][COEF_BANDS] [PREV_COEF_CONTEXTS][MAX_ENTROPY_TOKENS]; - unsigned int token_costs_8x8[BLOCK_TYPES_8X8] [COEF_BANDS] - [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; |