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_if.c | |
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_if.c')
-rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 9c0609ed1..a5659d628 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -466,8 +466,8 @@ static void configure_static_seg_features(VP9_COMP *cpi) { void vp9_update_mode_context_stats(VP9_COMP *cpi) { VP9_COMMON *cm = &cpi->common; int i, j; - unsigned int (*mv_ref_ct)[4][2] = cm->fc.mv_ref_ct; - int64_t (*mv_ref_stats)[4][2] = cpi->mv_ref_stats; + unsigned int (*mv_ref_ct)[VP9_MVREFS - 1][2] = cm->fc.mv_ref_ct; + int64_t (*mv_ref_stats)[VP9_MVREFS - 1][2] = cpi->mv_ref_stats; FILE *f; // Read the past stats counters @@ -2422,7 +2422,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, unsigned int *frame_flags) { VP9_COMMON *cm = &cpi->common; MACROBLOCKD *xd = &cpi->mb.e_mbd; - + TX_SIZE t; int q; int frame_over_shoot_limit; int frame_under_shoot_limit; @@ -3100,14 +3100,9 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, release_scaled_references(cpi); update_reference_frames(cpi); - vp9_full_to_model_counts(cpi->common.fc.coef_counts_4x4, - cpi->coef_counts_4x4); - vp9_full_to_model_counts(cpi->common.fc.coef_counts_8x8, - cpi->coef_counts_8x8); - vp9_full_to_model_counts(cpi->common.fc.coef_counts_16x16, - cpi->coef_counts_16x16); - vp9_full_to_model_counts(cpi->common.fc.coef_counts_32x32, - cpi->coef_counts_32x32); + for (t = TX_4X4; t <= TX_32X32; t++) + vp9_full_to_model_counts(cpi->common.fc.coef_counts[t], + cpi->coef_counts[t]); if (!cpi->common.error_resilient_mode && !cpi->common.frame_parallel_decoding_mode) { vp9_adapt_coef_probs(&cpi->common); |