From: John Koleszar Date: Tue, 26 Jul 2011 14:22:42 +0000 (-0400) Subject: Merge remote branch 'internal/upstream' into HEAD X-Git-Tag: v1.3.0~1217^2~380^2~225 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=62400028;p=libvpx Merge remote branch 'internal/upstream' into HEAD Conflicts: vp8/decoder/detokenize.c vp8/decoder/onyxd_int.h Change-Id: Ib9b516b939358ac8bf694200a8425fdd62c8d149 --- 62400028e22b3544eac09724afe45f3cd55766a1 diff --cc vp8/decoder/detokenize.c index 6121490eb,1a71948cb..025f9dfe4 --- a/vp8/decoder/detokenize.c +++ b/vp8/decoder/detokenize.c @@@ -50,48 -38,34 +50,38 @@@ DECLARE_ALIGNED(64, static const unsign #define CAT_THREE_CONTEXT_NODE 9 #define CAT_FIVE_CONTEXT_NODE 10 - /* - //the definition is put in "onyxd_int.h" - typedef struct - { - INT16 min_val; - INT16 Length; - UINT8 Probs[14]; - } TOKENEXTRABITS; - */ + #define CAT1_MIN_VAL 5 + #define CAT2_MIN_VAL 7 + #define CAT3_MIN_VAL 11 + #define CAT4_MIN_VAL 19 + #define CAT5_MIN_VAL 35 + #define CAT6_MIN_VAL 67 - + #define CAT1_PROB0 159 + #define CAT2_PROB0 145 + #define CAT2_PROB1 165 + + #define CAT3_PROB0 140 + #define CAT3_PROB1 148 + #define CAT3_PROB2 173 + + #define CAT4_PROB0 135 + #define CAT4_PROB1 140 + #define CAT4_PROB2 155 + #define CAT4_PROB3 176 + + #define CAT5_PROB0 130 + #define CAT5_PROB1 134 + #define CAT5_PROB2 141 + #define CAT5_PROB3 157 + #define CAT5_PROB4 180 + +#if CONFIG_EXTEND_QRANGE - DECLARE_ALIGNED(16, static const TOKENEXTRABITS, vp8d_token_extra_bits2[MAX_ENTROPY_TOKENS]) = - { - { 0, -1, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* ZERO_TOKEN */ - { 1, 0, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* ONE_TOKEN */ - { 2, 0, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* TWO_TOKEN */ - { 3, 0, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* THREE_TOKEN */ - { 4, 0, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* FOUR_TOKEN */ - { 5, 0, { 159, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* DCT_VAL_CATEGORY1 */ - { 7, 1, { 145, 165, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* DCT_VAL_CATEGORY2 */ - { 11, 2, { 140, 148, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* DCT_VAL_CATEGORY3 */ - { 19, 3, { 135, 140, 155, 176, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* DCT_VAL_CATEGORY4 */ - { 35, 4, { 130, 134, 141, 157, 180, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* DCT_VAL_CATEGORY5 */ - { 67, 12, { 129, 130, 133, 140, 153, 177, 196, 230, 243, 249, 252, 254, 254, 0 } }, /* DCT_VAL_CATEGORY6 */ - { 0, -1, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* EOB TOKEN */ - }; ++static const unsigned char cat6_prob[14] = ++{ 129, 130, 133, 140, 153, 177, 196, 230, 243, 249, 252, 254, 254, 0 }; +#else - DECLARE_ALIGNED(16, static const TOKENEXTRABITS, vp8d_token_extra_bits2[MAX_ENTROPY_TOKENS]) = - { - { 0, -1, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* ZERO_TOKEN */ - { 1, 0, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* ONE_TOKEN */ - { 2, 0, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* TWO_TOKEN */ - { 3, 0, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* THREE_TOKEN */ - { 4, 0, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* FOUR_TOKEN */ - { 5, 0, { 159, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* DCT_VAL_CATEGORY1 */ - { 7, 1, { 145, 165, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* DCT_VAL_CATEGORY2 */ - { 11, 2, { 140, 148, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* DCT_VAL_CATEGORY3 */ - { 19, 3, { 135, 140, 155, 176, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* DCT_VAL_CATEGORY4 */ - { 35, 4, { 130, 134, 141, 157, 180, 0, 0, 0, 0, 0, 0, 0 } }, /* DCT_VAL_CATEGORY5 */ - { 67, 10, { 129, 130, 133, 140, 153, 177, 196, 230, 243, 254, 254, 0 } }, /* DCT_VAL_CATEGORY6 */ - { 0, -1, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* EOB TOKEN */ - }; + static const unsigned char cat6_prob[12] = + { 129, 130, 133, 140, 153, 177, 196, 230, 243, 254, 254, 0 }; +#endif void vp8_reset_mb_tokens_context(MACROBLOCKD *x) @@@ -227,32 -161,12 +218,32 @@@ DECLARE_ALIGNED(16, extern const unsign qcoeff_ptr [ scan[c] ] = (INT16) v; \ ++c; \ goto DO_WHILE; }\ - qcoeff_ptr [ scan[15] ] = (INT16) v; \ + qcoeff_ptr [ 15 ] = (INT16) v; \ goto BLOCK_FINISHED; +#if CONFIG_T8X8 +#define DECODE_SIGN_WRITE_COEFF_AND_CHECK_EXIT_8x8_2(val) \ + DECODE_AND_APPLYSIGN(val) \ + Prob = coef_probs + (ENTROPY_NODES*2); \ + if(c < 3){\ + qcoeff_ptr [ scan[c] ] = (INT16) v; \ + ++c; \ + goto DO_WHILE_8x8; }\ + qcoeff_ptr [ scan[3] ] = (INT16) v; \ + goto BLOCK_FINISHED_8x8; +#define DECODE_SIGN_WRITE_COEFF_AND_CHECK_EXIT_8x8(val) \ + DECODE_AND_APPLYSIGN(val) \ + Prob = coef_probs + (ENTROPY_NODES*2); \ + if(c < 63){\ + qcoeff_ptr [ scan[c] ] = (INT16) v; \ + ++c; \ + goto DO_WHILE_8x8; }\ + qcoeff_ptr [ scan[63] ] = (INT16) v; \ + goto BLOCK_FINISHED_8x8; +#endif - #define DECODE_EXTRABIT_AND_ADJUST_VAL(t,bits_count)\ - split = 1 + (((range-1) * vp8d_token_extra_bits2[t].Probs[bits_count]) >> 8); \ + #define DECODE_EXTRABIT_AND_ADJUST_VAL(prob, bits_count)\ + split = 1 + (((range-1) * prob) >> 8); \ bigsplit = (VP8_BD_VALUE)split << (VP8_BD_VALUE_SIZE - 8); \ FILL \ if(value >= bigsplit)\ @@@ -694,12 -261,17 +686,17 @@@ DO_WHILE CHECK_0_: DECODE_AND_LOOP_IF_ZERO(Prob[ZERO_CONTEXT_NODE], CHECK_0_); DECODE_AND_BRANCH_IF_ZERO(Prob[ONE_CONTEXT_NODE], ONE_CONTEXT_NODE_0_); - DECODE_AND_BRANCH_IF_ZERO(Prob[LOW_VAL_CONTEXT_NODE], LOW_VAL_CONTEXT_NODE_0_); - DECODE_AND_BRANCH_IF_ZERO(Prob[HIGH_LOW_CONTEXT_NODE], HIGH_LOW_CONTEXT_NODE_0_); - DECODE_AND_BRANCH_IF_ZERO(Prob[CAT_THREEFOUR_CONTEXT_NODE], CAT_THREEFOUR_CONTEXT_NODE_0_); - DECODE_AND_BRANCH_IF_ZERO(Prob[CAT_FIVE_CONTEXT_NODE], CAT_FIVE_CONTEXT_NODE_0_); - val = vp8d_token_extra_bits2[DCT_VAL_CATEGORY6].min_val; - bits_count = vp8d_token_extra_bits2[DCT_VAL_CATEGORY6].Length; + DECODE_AND_BRANCH_IF_ZERO(Prob[LOW_VAL_CONTEXT_NODE], + LOW_VAL_CONTEXT_NODE_0_); + DECODE_AND_BRANCH_IF_ZERO(Prob[HIGH_LOW_CONTEXT_NODE], + HIGH_LOW_CONTEXT_NODE_0_); + DECODE_AND_BRANCH_IF_ZERO(Prob[CAT_THREEFOUR_CONTEXT_NODE], + CAT_THREEFOUR_CONTEXT_NODE_0_); + DECODE_AND_BRANCH_IF_ZERO(Prob[CAT_FIVE_CONTEXT_NODE], + CAT_FIVE_CONTEXT_NODE_0_); + + val = CAT6_MIN_VAL; - bits_count = 10; ++ bits_count = CONFIG_EXTEND_QRANGE?14:12; do { diff --cc vp8/decoder/onyxd_int.h index 6309915ab,4e8da50df..bb05ea826 --- a/vp8/decoder/onyxd_int.h +++ b/vp8/decoder/onyxd_int.h @@@ -47,32 -45,10 +47,16 @@@ typedef struc 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;