diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-03-05 11:17:14 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-03-05 11:17:14 -0800 |
| commit | 4209bba4627bb148fce5b8b6caa4de5ac526fa92 (patch) | |
| tree | 7f6331977912073a0c30b5859d87afaf3fd4ec41 /vp9/encoder/vp9_bitstream.c | |
| parent | 764be4f66fc3928ec668f8faccef1705049ff5a5 (diff) | |
| parent | 97dd7342b8591627b7dd07cb79f91b544213caa9 (diff) | |
| download | libvpx-4209bba4627bb148fce5b8b6caa4de5ac526fa92.tar libvpx-4209bba4627bb148fce5b8b6caa4de5ac526fa92.tar.gz libvpx-4209bba4627bb148fce5b8b6caa4de5ac526fa92.tar.bz2 libvpx-4209bba4627bb148fce5b8b6caa4de5ac526fa92.zip | |
Merge changes Ifacbf5a0,Ibad7c3dd into experimental
* changes:
vpxenc: actually report mismatch on stderr.
Make superblocks independent of macroblock code and data.
Diffstat (limited to 'vp9/encoder/vp9_bitstream.c')
| -rw-r--r-- | vp9/encoder/vp9_bitstream.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index d0e97db7b..b05da870c 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -45,7 +45,7 @@ int intra_mode_stats[VP9_KF_BINTRAMODES] vp9_coeff_stats tree_update_hist_4x4[BLOCK_TYPES]; vp9_coeff_stats tree_update_hist_8x8[BLOCK_TYPES]; vp9_coeff_stats tree_update_hist_16x16[BLOCK_TYPES]; -vp9_coeff_stats tree_update_hist_32x32[BLOCK_TYPES_32X32]; +vp9_coeff_stats tree_update_hist_32x32[BLOCK_TYPES]; extern unsigned int active_section; #endif @@ -1229,7 +1229,7 @@ static void build_coeff_contexts(VP9_COMP *cpi) { #ifdef ENTROPY_STATS cpi, context_counters_32x32, #endif - cpi->frame_branch_ct_32x32, BLOCK_TYPES_32X32); + cpi->frame_branch_ct_32x32, BLOCK_TYPES); } static void update_coef_probs_common(vp9_writer* const bc, @@ -1388,7 +1388,7 @@ static void update_coef_probs(VP9_COMP* const cpi, vp9_writer* const bc) { cpi->frame_coef_probs_32x32, cpi->common.fc.coef_probs_32x32, cpi->frame_branch_ct_32x32, - BLOCK_TYPES_32X32); + BLOCK_TYPES); } } @@ -2106,13 +2106,13 @@ void print_tree_update_probs() { fprintf(f, "\n/* Update probabilities for token entropy tree. */\n\n"); print_tree_update_for_type(f, tree_update_hist_4x4, BLOCK_TYPES, - "vp9_coef_update_probs_4x4[BLOCK_TYPES_4X4]"); + "vp9_coef_update_probs_4x4[BLOCK_TYPES]"); print_tree_update_for_type(f, tree_update_hist_8x8, BLOCK_TYPES, - "vp9_coef_update_probs_8x8[BLOCK_TYPES_8X8]"); + "vp9_coef_update_probs_8x8[BLOCK_TYPES]"); print_tree_update_for_type(f, tree_update_hist_16x16, BLOCK_TYPES, - "vp9_coef_update_probs_16x16[BLOCK_TYPES_16X16]"); - print_tree_update_for_type(f, tree_update_hist_32x32, BLOCK_TYPES_32X32, - "vp9_coef_update_probs_32x32[BLOCK_TYPES_32X32]"); + "vp9_coef_update_probs_16x16[BLOCK_TYPES]"); + print_tree_update_for_type(f, tree_update_hist_32x32, BLOCK_TYPES, + "vp9_coef_update_probs_32x32[BLOCK_TYPES]"); fclose(f); f = fopen("treeupdate.bin", "wb"); |