diff options
| author | Deb Mukherjee <debargha@google.com> | 2013-06-04 15:25:16 -0700 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2013-06-05 10:11:52 -0700 |
| commit | 83885235a7398045302a62f9afccd0c4b27324ab (patch) | |
| tree | af3aa7d0fef3a3f7a5c5481a11d6009930a4323d /vp9/encoder/vp9_encodeframe.c | |
| parent | 513d326d75d4616c44a8a188ddfa2495d485b344 (diff) | |
| download | libvpx-83885235a7398045302a62f9afccd0c4b27324ab.tar libvpx-83885235a7398045302a62f9afccd0c4b27324ab.tar.gz libvpx-83885235a7398045302a62f9afccd0c4b27324ab.tar.bz2 libvpx-83885235a7398045302a62f9afccd0c4b27324ab.zip | |
Clean-ups on switchable interpolation and mv_ref
Adds backward adaptation and differential forward updates of switchable
interpolation filter probabilities. Also adds some cosmetic cleanups
and minor fixes on mv_ref probabilities.
derfraw300: +0.353% (with most coming from switchable interp changes)
Change-Id: Ie2718be73528c945fd0d80cfd63ca2d9cb3032de
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index d1666df2a..3ced30d56 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -472,7 +472,7 @@ static void update_state(VP9_COMP *cpi, if (cpi->common.mcomp_filter_type == SWITCHABLE && is_inter_mode(mbmi->mode)) { - ++cpi->switchable_interp_count + ++cpi->common.fc.switchable_interp_count [vp9_get_pred_context(&cpi->common, xd, PRED_SWITCHABLE_INTERP)] [vp9_switchable_interp_map[mbmi->interp_filter]]; } @@ -1460,7 +1460,7 @@ static void init_encode_frame_mb_context(VP9_COMP *cpi) { vp9_zero(cpi->count_mb_ref_frame_usage) vp9_zero(cpi->y_mode_count) vp9_zero(cpi->y_uv_mode_count) - vp9_zero(cpi->common.fc.mv_ref_ct) + vp9_zero(cpi->common.fc.inter_mode_counts) vp9_zero(cpi->partition_count); // Note: this memset assumes above_context[0], [1] and [2] @@ -1524,7 +1524,7 @@ static void encode_frame_internal(VP9_COMP *cpi) { cpi->skip_true_count[0] = cpi->skip_true_count[1] = cpi->skip_true_count[2] = 0; cpi->skip_false_count[0] = cpi->skip_false_count[1] = cpi->skip_false_count[2] = 0; - vp9_zero(cpi->switchable_interp_count); + vp9_zero(cm->fc.switchable_interp_count); vp9_zero(cpi->best_switchable_interp_count); xd->mode_info_context = cm->mi; |