diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2013-05-07 16:42:21 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-07 16:24:08 -0700 |
| commit | 1ed57a6a6286d371ab00c22dbb9010a8f87de51e (patch) | |
| tree | 29fa28278942067240748adbb18d61e58862cc61 /vp9/encoder/vp9_encodeframe.c | |
| parent | 0bfcd30768ab07de5a2a28f872fae12bbabfd3fe (diff) | |
| download | libvpx-1ed57a6a6286d371ab00c22dbb9010a8f87de51e.tar libvpx-1ed57a6a6286d371ab00c22dbb9010a8f87de51e.tar.gz libvpx-1ed57a6a6286d371ab00c22dbb9010a8f87de51e.tar.bz2 libvpx-1ed57a6a6286d371ab00c22dbb9010a8f87de51e.zip | |
Deprecate comp_interintra_pred experiment.
Delete code under the CONFIG_COMP_INTERINTRA_PRED
flag.
Change-Id: I3d1079cf46305c08f7e11d738596ea112e7b547f
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index aa9f33a82..553534ad6 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -487,20 +487,7 @@ static void update_state(VP9_COMP *cpi, for (i = 0; i < bw; ++i) xd->mode_info_context[mis * j + i].mbmi = *mbmi; } -#if CONFIG_COMP_INTERINTRA_PRED - if (mbmi->mode >= NEARESTMV && mbmi->mode < SPLITMV && - mbmi->second_ref_frame <= INTRA_FRAME) { - if (mbmi->second_ref_frame == INTRA_FRAME) { - ++cpi->interintra_count[1]; - ++cpi->ymode_count[mbmi->interintra_mode]; -#if SEPARATE_INTERINTRA_UV - ++cpi->y_uv_mode_count[mbmi->interintra_mode][mbmi->interintra_uv_mode]; -#endif - } else { - ++cpi->interintra_count[0]; - } - } -#endif + if (cpi->common.mcomp_filter_type == SWITCHABLE && is_inter_mode(mbmi->mode)) { ++cpi->switchable_interp_count @@ -1439,11 +1426,6 @@ static void init_encode_frame_mb_context(VP9_COMP *cpi) { vp9_zero(cpi->sb_ymode_count) vp9_zero(cpi->partition_count); -#if CONFIG_COMP_INTERINTRA_PRED - vp9_zero(cpi->interintra_count); - vp9_zero(cpi->interintra_select_count); -#endif - // Note: this memset assumes above_context[0], [1] and [2] // are allocated as part of the same buffer. vpx_memset(cm->above_context[0], 0, sizeof(ENTROPY_CONTEXT) * 4 * |