diff options
Diffstat (limited to 'vp8/common/entropy.c')
-rw-r--r-- | vp8/common/entropy.c | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/vp8/common/entropy.c b/vp8/common/entropy.c index 0eee60ec8..f3d5a9cb7 100644 --- a/vp8/common/entropy.c +++ b/vp8/common/entropy.c @@ -15,6 +15,7 @@ #include "string.h" #include "blockd.h" #include "onyxc_int.h" +#include "vpx_mem/vpx_mem.h" #define uchar unsigned char /* typedefs can clash */ #define uint unsigned int @@ -153,39 +154,15 @@ vp8_extra_bit_struct vp8_extra_bits[12] = { cat6, Pcat6, 11, 67}, { 0, 0, 0, 0} }; -#include "defaultcoefcounts.h" + +#include "default_coef_probs.h" void vp8_default_coef_probs(VP8_COMMON *pc) { - int h = 0; - - do - { - int i = 0; - - do - { - int k = 0; - - do - { - unsigned int branch_ct [ENTROPY_NODES] [2]; - vp8_tree_probs_from_distribution( - MAX_ENTROPY_TOKENS, vp8_coef_encodings, vp8_coef_tree, - pc->fc.coef_probs[h][i][k], - branch_ct, - vp8_default_coef_counts[h][i][k], - 256, 1); - - } - while (++k < PREV_COEF_CONTEXTS); - } - while (++i < COEF_BANDS); - } - while (++h < BLOCK_TYPES); + vpx_memcpy(pc->fc.coef_probs, default_coef_probs, + sizeof(default_coef_probs)); } - void vp8_coef_tree_initialize() { init_bit_trees(); |