diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-05-31 09:59:24 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-31 09:59:24 -0700 |
| commit | a288cb3b102ded780245a0c8fec4e0dc1494f26b (patch) | |
| tree | d9b862e497fac697abb555fdca8e6a72b959d850 /vp9/encoder/vp9_onyx_int.h | |
| parent | 1e025dbfd118578081a7433c19fc7877ac5ad1db (diff) | |
| parent | e9d68a5e36d82d99918918438840f2b6f9735a05 (diff) | |
| download | libvpx-a288cb3b102ded780245a0c8fec4e0dc1494f26b.tar libvpx-a288cb3b102ded780245a0c8fec4e0dc1494f26b.tar.gz libvpx-a288cb3b102ded780245a0c8fec4e0dc1494f26b.tar.bz2 libvpx-a288cb3b102ded780245a0c8fec4e0dc1494f26b.zip | |
Merge "Merge all various transform size data trackers into single variables." into experimental
Diffstat (limited to 'vp9/encoder/vp9_onyx_int.h')
| -rw-r--r-- | vp9/encoder/vp9_onyx_int.h | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index 9e259762d..dece45791 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -76,10 +76,7 @@ typedef struct { // 0 = I4X4_PRED, ZERO_MV, MV, SPLIT signed char last_mode_lf_deltas[MAX_MODE_LF_DELTAS]; - vp9_coeff_probs_model coef_probs_4x4[BLOCK_TYPES]; - vp9_coeff_probs_model coef_probs_8x8[BLOCK_TYPES]; - vp9_coeff_probs_model coef_probs_16x16[BLOCK_TYPES]; - vp9_coeff_probs_model coef_probs_32x32[BLOCK_TYPES]; + vp9_coeff_probs_model coef_probs[TX_SIZE_MAX_SB][BLOCK_TYPES]; vp9_prob y_mode_prob[VP9_INTRA_MODES - 1]; /* interframe intra mode probs */ vp9_prob uv_mode_prob[VP9_INTRA_MODES][VP9_INTRA_MODES - 1]; @@ -414,21 +411,9 @@ typedef struct VP9_COMP { nmv_context_counts NMVcount; - vp9_coeff_count coef_counts_4x4[BLOCK_TYPES]; - vp9_coeff_probs_model frame_coef_probs_4x4[BLOCK_TYPES]; - vp9_coeff_stats frame_branch_ct_4x4[BLOCK_TYPES]; - - vp9_coeff_count coef_counts_8x8[BLOCK_TYPES]; - vp9_coeff_probs_model frame_coef_probs_8x8[BLOCK_TYPES]; - vp9_coeff_stats frame_branch_ct_8x8[BLOCK_TYPES]; - - vp9_coeff_count coef_counts_16x16[BLOCK_TYPES]; - vp9_coeff_probs_model frame_coef_probs_16x16[BLOCK_TYPES]; - vp9_coeff_stats frame_branch_ct_16x16[BLOCK_TYPES]; - - vp9_coeff_count coef_counts_32x32[BLOCK_TYPES]; - vp9_coeff_probs_model frame_coef_probs_32x32[BLOCK_TYPES]; - vp9_coeff_stats frame_branch_ct_32x32[BLOCK_TYPES]; + vp9_coeff_count coef_counts[TX_SIZE_MAX_SB][BLOCK_TYPES]; + vp9_coeff_probs_model frame_coef_probs[TX_SIZE_MAX_SB][BLOCK_TYPES]; + vp9_coeff_stats frame_branch_ct[TX_SIZE_MAX_SB][BLOCK_TYPES]; int gfu_boost; int last_boost; |