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_ratectrl.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_ratectrl.c')
| -rw-r--r-- | vp9/encoder/vp9_ratectrl.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c index f4426adaa..748c3a8d1 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -139,10 +139,7 @@ void vp9_save_coding_context(VP9_COMP *cpi) { vp9_copy(cc->last_ref_lf_deltas, xd->last_ref_lf_deltas); vp9_copy(cc->last_mode_lf_deltas, xd->last_mode_lf_deltas); - vp9_copy(cc->coef_probs_4x4, cm->fc.coef_probs_4x4); - vp9_copy(cc->coef_probs_8x8, cm->fc.coef_probs_8x8); - vp9_copy(cc->coef_probs_16x16, cm->fc.coef_probs_16x16); - vp9_copy(cc->coef_probs_32x32, cm->fc.coef_probs_32x32); + vp9_copy(cc->coef_probs, cm->fc.coef_probs); vp9_copy(cc->switchable_interp_prob, cm->fc.switchable_interp_prob); } @@ -177,10 +174,7 @@ void vp9_restore_coding_context(VP9_COMP *cpi) { vp9_copy(xd->last_ref_lf_deltas, cc->last_ref_lf_deltas); vp9_copy(xd->last_mode_lf_deltas, cc->last_mode_lf_deltas); - vp9_copy(cm->fc.coef_probs_4x4, cc->coef_probs_4x4); - vp9_copy(cm->fc.coef_probs_8x8, cc->coef_probs_8x8); - vp9_copy(cm->fc.coef_probs_16x16, cc->coef_probs_16x16); - vp9_copy(cm->fc.coef_probs_32x32, cc->coef_probs_32x32); + vp9_copy(cm->fc.coef_probs, cc->coef_probs); vp9_copy(cm->fc.switchable_interp_prob, cc->switchable_interp_prob); } |